diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index d282a4c4f4..2cfe26d4d4 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -323,6 +323,7 @@ 6165970F48D70C4EF06D35C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LowLevelGraphicsSoftwareRenderer.cpp"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"; sourceTree = "SOURCE_ROOT"; }; 619D4AFD1F66A75AE05DDAE1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReadWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.h"; sourceTree = "SOURCE_ROOT"; }; 61A072FFE3185BDDC42DA144 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BigInteger.cpp"; path = "../../../../modules/juce_core/maths/juce_BigInteger.cpp"; sourceTree = "SOURCE_ROOT"; }; + 61BE37E2B26C25056D9E8FE2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_NewComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_NewComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; 620C2E1340FB7A40C1A2316B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LowLevelGraphicsSoftwareRenderer.h"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"; sourceTree = "SOURCE_ROOT"; }; 628869AB2D553E2A6C68C748 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarComponent.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarComponent.h"; sourceTree = "SOURCE_ROOT"; }; 63092DCDC875D681A5677105 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_events/juce_module_info"; sourceTree = "SOURCE_ROOT"; }; @@ -609,20 +610,18 @@ C83992DA0BE30EA3CD06EA98 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ProgressBar.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ProgressBar.h"; sourceTree = "SOURCE_ROOT"; }; C85B4D62B96F4A44890F20E2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SortedSet.h"; path = "../../../../modules/juce_core/containers/juce_SortedSet.h"; sourceTree = "SOURCE_ROOT"; }; C8A229ACD244F402C57286CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_MSVC.h"; path = "../../Source/Project Saving/jucer_ProjectExport_MSVC.h"; sourceTree = "SOURCE_ROOT"; }; - C90C66C5727759D5CBD5FB07 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AbstractFifo.cpp"; path = "../../../../modules/juce_core/containers/juce_AbstractFifo.cpp"; sourceTree = "SOURCE_ROOT"; }; C9616830BB2474066AC8C910 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ResourceFile.h"; path = "../../Source/Project Saving/jucer_ResourceFile.h"; sourceTree = "SOURCE_ROOT"; }; - C9871C46DEDD05103443DC33 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NewLine.h"; path = "../../../../modules/juce_core/text/juce_NewLine.h"; sourceTree = "SOURCE_ROOT"; }; C9DCA94BF8A4C583E5392755 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MultiTimer.cpp"; path = "../../../../modules/juce_events/timers/juce_MultiTimer.cpp"; sourceTree = "SOURCE_ROOT"; }; CA62F9F7C5F0D77D8E33D91F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SplashScreen.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SplashScreen.h"; sourceTree = "SOURCE_ROOT"; }; CB36CD7F57D0F4231DC98686 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Message.h"; path = "../../../../modules/juce_events/messages/juce_Message.h"; sourceTree = "SOURCE_ROOT"; }; CB48495010366C2E371BEFDB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemStats.cpp"; path = "../../../../modules/juce_core/system/juce_SystemStats.cpp"; sourceTree = "SOURCE_ROOT"; }; CBE0B96838EE76C9CB8E1230 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ColourGradient.cpp"; path = "../../../../modules/juce_graphics/colour/juce_ColourGradient.cpp"; sourceTree = "SOURCE_ROOT"; }; CC3F5263B16932FF4E74B9D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CodeEditorComponent.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h"; sourceTree = "SOURCE_ROOT"; }; + CC63B9EC2E95FD4AF7608D8E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharacterFunctions.h"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.h"; sourceTree = "SOURCE_ROOT"; }; CD140A1C0161176682F6CA29 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp"; sourceTree = "SOURCE_ROOT"; }; CD3216F23C7B273B010A8D12 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CustomTypeface.h"; path = "../../../../modules/juce_graphics/fonts/juce_CustomTypeface.h"; sourceTree = "SOURCE_ROOT"; }; CD8F40A9EF6ECAD083543974 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WildcardFileFilter.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h"; sourceTree = "SOURCE_ROOT"; }; CDCAF0EC777DA2884AEB2B59 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; }; - CDDF5BDC75277F7B83A38885 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; }; CDF8F65F9079B2C14A740F0F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ImageButton.h"; sourceTree = "SOURCE_ROOT"; }; CE1DFE4E3908943656E180AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_UnitTest.cpp"; path = "../../../../modules/juce_core/unit_tests/juce_UnitTest.cpp"; sourceTree = "SOURCE_ROOT"; }; CF0615A1AF1A514A60322B50 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseCursor.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseCursor.h"; sourceTree = "SOURCE_ROOT"; }; @@ -635,29 +634,33 @@ D141433D3FE81F20490DE928 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Desktop.h"; path = "../../../../modules/juce_gui_basics/components/juce_Desktop.h"; sourceTree = "SOURCE_ROOT"; }; D1F9B0E9F5D54FE48BEB46EA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; D253F74B7F5734984E568CA7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Files.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Files.cpp"; sourceTree = "SOURCE_ROOT"; }; - D2F1CF252F7EC62B35A21CB6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadowEffect.cpp"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"; sourceTree = "SOURCE_ROOT"; }; + D2F80DA0946A5EE01FC016CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_UTF32.h"; path = "../../../../modules/juce_core/text/juce_CharPointer_UTF32.h"; sourceTree = "SOURCE_ROOT"; }; D376B9B54EC944E766AFEC45 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PopupMenu.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_PopupMenu.cpp"; sourceTree = "SOURCE_ROOT"; }; D4697A0232AECE5DAC5E332E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChoicePropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D4E56676E2EF83404EDCBA8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextEditor.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_TextEditor.cpp"; sourceTree = "SOURCE_ROOT"; }; D4F2D42C58F4D86E00E76F31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandID.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandID.h"; sourceTree = "SOURCE_ROOT"; }; D503780AB98993E8F0BA1311 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageComponent.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ImageComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; - D5057D7B18ABD5E810A6F830 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeface.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp"; sourceTree = "SOURCE_ROOT"; }; D526C38D581425949BA0E4AC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePreviewComponent.h"; path = "../../Source/Application/jucer_FilePreviewComponent.h"; sourceTree = "SOURCE_ROOT"; }; D53B54D1786A1FFC024BF064 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_cryptography.mm"; path = "../../../../modules/juce_cryptography/juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; }; + D5A6D00DEFDC650AF432A698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Initialisation.h"; path = "../../../../modules/juce_gui_basics/application/juce_Initialisation.h"; sourceTree = "SOURCE_ROOT"; }; D678882D133090214AF681BC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadLocalValue.h"; path = "../../../../modules/juce_core/threads/juce_ThreadLocalValue.h"; sourceTree = "SOURCE_ROOT"; }; D6C91E2BF537F75A80F5C1DB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ListBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ListBox.h"; sourceTree = "SOURCE_ROOT"; }; D75EAC16FAECCC51E3669193 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandInfo.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h"; sourceTree = "SOURCE_ROOT"; }; + D780ED33573AED5AD383A036 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CaretComponent.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_CaretComponent.h"; sourceTree = "SOURCE_ROOT"; }; + D782DA091AD3ECE158FC6A5F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ButtonPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; + D7A7F1AA9F313B0CCAAA73A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; }; D9B077E2ECDDA94961E134D7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; }; DC5E7FF30B01118F6DAEC38F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Time.cpp"; path = "../../../../modules/juce_core/time/juce_Time.cpp"; sourceTree = "SOURCE_ROOT"; }; + DD2494D5F1C081898D616AF5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; }; + E2374E15D65425C4101237E2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewComponentTemplate.h"; path = "../../Source/BinaryData/jucer_NewComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; }; E5D6C36496F5BC84D7213BE8 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; E96597BBC6A98255B51B94DC = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 25F52316D256B4534BED16D1 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; - CC63B9EC2E95FD4AF7608D8E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharacterFunctions.h"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.h"; sourceTree = "SOURCE_ROOT"; }; - D2F80DA0946A5EE01FC016CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_UTF32.h"; path = "../../../../modules/juce_core/text/juce_CharPointer_UTF32.h"; sourceTree = "SOURCE_ROOT"; }; - D5A6D00DEFDC650AF432A698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Initialisation.h"; path = "../../../../modules/juce_gui_basics/application/juce_Initialisation.h"; sourceTree = "SOURCE_ROOT"; }; - D780ED33573AED5AD383A036 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CaretComponent.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_CaretComponent.h"; sourceTree = "SOURCE_ROOT"; }; - D782DA091AD3ECE158FC6A5F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ButtonPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; - D7A7F1AA9F313B0CCAAA73A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; }; + C90C66C5727759D5CBD5FB07 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AbstractFifo.cpp"; path = "../../../../modules/juce_core/containers/juce_AbstractFifo.cpp"; sourceTree = "SOURCE_ROOT"; }; + C9871C46DEDD05103443DC33 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NewLine.h"; path = "../../../../modules/juce_core/text/juce_NewLine.h"; sourceTree = "SOURCE_ROOT"; }; + CDDF5BDC75277F7B83A38885 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; }; + D2F1CF252F7EC62B35A21CB6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadowEffect.cpp"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"; sourceTree = "SOURCE_ROOT"; }; + D5057D7B18ABD5E810A6F830 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeface.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp"; sourceTree = "SOURCE_ROOT"; }; D800DE818BEDBF4579D15B1D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; }; D926E13AB5AD647A7A00F486 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; }; D9342535EA61901A1AD816C6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -667,7 +670,6 @@ DB876F7873F42DC685A58CA7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; DCCB75165B7C73A589498E87 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; }; DD00494140C86144306A9356 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Array.h"; path = "../../../../modules/juce_core/containers/juce_Array.h"; sourceTree = "SOURCE_ROOT"; }; - DD2494D5F1C081898D616AF5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; }; DD985A60FB76E976AF91852D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SHA256.h"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.h"; sourceTree = "SOURCE_ROOT"; }; DE40B42B57F29C650CB7F2AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RecentlyOpenedFilesList.h"; path = "../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h"; sourceTree = "SOURCE_ROOT"; }; DE5F3C9EF6BFFDE73AF9E7FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -737,6 +739,7 @@ F71AF6D2DF3E652F8B51EBAB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectExporter.cpp"; path = "../../Source/Project Saving/jucer_ProjectExporter.cpp"; sourceTree = "SOURCE_ROOT"; }; F797071D88542C813CF7222A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_Module.cpp"; path = "../../Source/Project/jucer_Module.cpp"; sourceTree = "SOURCE_ROOT"; }; F7A91434FEFBE9AC130CD814 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewProjectWizard.h"; path = "../../Source/Project/jucer_NewProjectWizard.h"; sourceTree = "SOURCE_ROOT"; }; + F7CAB5BC15EE351949D3F2C3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewInlineComponentTemplate.h"; path = "../../Source/BinaryData/jucer_NewInlineComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; }; F7D7A41EFE97269721C61BF4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FillType.h"; path = "../../../../modules/juce_graphics/colour/juce_FillType.h"; sourceTree = "SOURCE_ROOT"; }; F7E829D0B21B9C1B4790A245 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_UndoManager.cpp"; path = "../../../../modules/juce_data_structures/undomanager/juce_UndoManager.cpp"; sourceTree = "SOURCE_ROOT"; }; F7EAAE1A1BD13685BFF6176E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ZipFile.cpp"; path = "../../../../modules/juce_core/zip/juce_ZipFile.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -839,8 +842,11 @@ 03D3053EDE47FED1919C6674, 18D9EBA1DAE45EEF81FD5C8F, 0FC137539030B1A9152F680C, + 61BE37E2B26C25056D9E8FE2, + E2374E15D65425C4101237E2, CF8011B3C67B609032974DA5, 53151B683E11F420203E61C2, + F7CAB5BC15EE351949D3F2C3, 087959CCC447DA59FBD5787E, 7DF304ACC22704A1B2454B68 ); name = BinaryData; sourceTree = ""; }; D3109994DA6AD871BE85C4E2 = { isa = PBXGroup; children = ( diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index 7abc9fe559..e6aa6e3d24 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -307,6 +307,26 @@ + + + + + + + + + + + + + + + + @@ -327,6 +347,16 @@ + + + + + + + + diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj index b8f31c146a..5a10e8d117 100644 --- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj @@ -307,6 +307,26 @@ + + + + + + + + + + + + + + + + @@ -327,6 +347,16 @@ + + + + + + + + diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj index d90a13e000..6b834e072f 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj @@ -163,6 +163,9 @@ true + + true + true @@ -1014,7 +1017,9 @@ + + diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters index c74654edbe..711ce754ae 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters @@ -316,6 +316,9 @@ The Introjucer\BinaryData + + The Introjucer\BinaryData + The Introjucer\BinaryData @@ -1329,9 +1332,15 @@ The Introjucer\BinaryData + + The Introjucer\BinaryData + The Introjucer\BinaryData + + The Introjucer\BinaryData + The Introjucer\BinaryData diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer index bc7aaa1acc..1e348eb2a9 100644 --- a/extras/Introjucer/Introjucer.jucer +++ b/extras/Introjucer/Introjucer.jucer @@ -224,10 +224,16 @@ resource="1" file="Source/BinaryData/jucer_MainConsoleAppTemplate.cpp"/> + + + getApplicationName(),\r\n" +" : DocumentWindow (\"WINDOWCLASS\",\r\n" " Colours::lightgrey,\r\n" " DocumentWindow::allButtons)\r\n" "{\r\n" +" // At this point you should call setContentOwned() to give the window\r\n" +" // a component containing the content you want to show..\r\n" +"\r\n" +"\r\n" " centreWithSize (500, 400);\r\n" " setVisible (true);\r\n" "}\r\n" @@ -674,7 +842,7 @@ static const unsigned char temp_613d4455[] = "#ifndef HEADERGUARD\r\n" "#define HEADERGUARD\r\n" "\r\n" -"INCLUDES\r\n" +"INCLUDE_JUCE\r\n" "\r\n" "\r\n" "//==============================================================================\r\n" @@ -729,21 +897,27 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x4d0721bf: case 0xc244271a: numBytes = 799; return jucer_AudioPluginEditorTemplate_h; case 0x51b49ac5: - case 0xc68aa4a1: numBytes = 4455; return jucer_AudioPluginFilterTemplate_cpp; + case 0xc68aa4a1: numBytes = 4473; return jucer_AudioPluginFilterTemplate_cpp; case 0x488afa0a: case 0x99c7f951: numBytes = 2400; return jucer_AudioPluginFilterTemplate_h; case 0x8905395b: case 0x84a71cc0: numBytes = 470; return jucer_MainConsoleAppTemplate_cpp; case 0x7a0186b1: - case 0x73760f7c: numBytes = 1825; return jucer_MainTemplate_cpp; + case 0x73760f7c: numBytes = 1742; return jucer_MainTemplate_cpp; + case 0xf4842835: + case 0x1329dd50: numBytes = 1389; return jucer_NewComponentTemplate_cpp; + case 0xe7bf237a: + case 0x1e76fc7c: numBytes = 649; return jucer_NewComponentTemplate_h; case 0x02a2a077: - case 0x9a5d0862: numBytes = 232; return jucer_NewCppFileTemplate_cpp; + case 0x9a5d0862: numBytes = 260; return jucer_NewCppFileTemplate_cpp; case 0x0842c43c: case 0xfbfcda3c: numBytes = 308; return jucer_NewCppFileTemplate_h; + case 0x36e634a1: + case 0x2be6f132: numBytes = 1627; return jucer_NewInlineComponentTemplate_h; case 0x3f052be8: - case 0xb905d1ba: numBytes = 781; return jucer_WindowTemplate_cpp; + case 0xb905d1ba: numBytes = 905; return jucer_WindowTemplate_cpp; case 0xb20377ed: - case 0x959d5d38: numBytes = 1216; return jucer_WindowTemplate_h; + case 0x959d5d38: numBytes = 1220; return jucer_WindowTemplate_h; default: break; } diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.h b/extras/Introjucer/JuceLibraryCode/BinaryData.h index f46c116101..f22013f037 100644 --- a/extras/Introjucer/JuceLibraryCode/BinaryData.h +++ b/extras/Introjucer/JuceLibraryCode/BinaryData.h @@ -25,7 +25,7 @@ namespace BinaryData const int jucer_AudioPluginEditorTemplate_hSize = 799; extern const char* jucer_AudioPluginFilterTemplate_cpp; - const int jucer_AudioPluginFilterTemplate_cppSize = 4455; + const int jucer_AudioPluginFilterTemplate_cppSize = 4473; extern const char* jucer_AudioPluginFilterTemplate_h; const int jucer_AudioPluginFilterTemplate_hSize = 2400; @@ -34,19 +34,28 @@ namespace BinaryData const int jucer_MainConsoleAppTemplate_cppSize = 470; extern const char* jucer_MainTemplate_cpp; - const int jucer_MainTemplate_cppSize = 1825; + const int jucer_MainTemplate_cppSize = 1742; + + extern const char* jucer_NewComponentTemplate_cpp; + const int jucer_NewComponentTemplate_cppSize = 1389; + + extern const char* jucer_NewComponentTemplate_h; + const int jucer_NewComponentTemplate_hSize = 649; extern const char* jucer_NewCppFileTemplate_cpp; - const int jucer_NewCppFileTemplate_cppSize = 232; + const int jucer_NewCppFileTemplate_cppSize = 260; extern const char* jucer_NewCppFileTemplate_h; const int jucer_NewCppFileTemplate_hSize = 308; + extern const char* jucer_NewInlineComponentTemplate_h; + const int jucer_NewInlineComponentTemplate_hSize = 1627; + extern const char* jucer_WindowTemplate_cpp; - const int jucer_WindowTemplate_cppSize = 781; + const int jucer_WindowTemplate_cppSize = 905; extern const char* jucer_WindowTemplate_h; - const int jucer_WindowTemplate_hSize = 1216; + const int jucer_WindowTemplate_hSize = 1220; // If you provide the name of one of the binary resource variables above, this function will // return the corresponding data and its size (or a null pointer if the name isn't found). diff --git a/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp index e826aef0a8..e6dea437df 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp +++ b/extras/Introjucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp @@ -72,20 +72,20 @@ bool FILTERCLASSNAME::isOutputChannelStereoPair (int index) const bool FILTERCLASSNAME::acceptsMidi() const { -#if JucePlugin_WantsMidiInput + #if JucePlugin_WantsMidiInput return true; -#else + #else return false; -#endif + #endif } bool FILTERCLASSNAME::producesMidi() const { -#if JucePlugin_ProducesMidiOutput + #if JucePlugin_ProducesMidiOutput return true; -#else + #else return false; -#endif + #endif } int FILTERCLASSNAME::getNumPrograms() diff --git a/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp index f36084b0a9..f133a9a4c8 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp +++ b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp @@ -27,13 +27,13 @@ public: //============================================================================== void initialise (const String& commandLine) { - // Do your application's initialisation code here.. + // Add your application's initialisation code here.. APPINITCODE } void shutdown() { - // Do your application's shutdown code here.. + // Add your application's shutdown code here.. APPSHUTDOWNCODE } @@ -43,7 +43,6 @@ public: quit(); } - //============================================================================== const String getApplicationName() { return "APPNAME"; @@ -70,4 +69,4 @@ private: //============================================================================== // This macro generates the main() routine that starts the app. -START_JUCE_APPLICATION(APPCLASSNAME) +START_JUCE_APPLICATION (APPCLASSNAME) diff --git a/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.cpp new file mode 100644 index 0000000000..e4e47c8b43 --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.cpp @@ -0,0 +1,51 @@ +/* + ============================================================================== + + FILENAME + Created: DATE + Author: AUTHOR + + ============================================================================== +*/ + +INCLUDE_JUCE +INCLUDE_CORRESPONDING_HEADER + +//============================================================================== +COMPONENTCLASS::COMPONENTCLASS() +{ + // In your constructor, you should add any child components, and + // initialise any special settings that your component needs. + +} + +COMPONENTCLASS::~COMPONENTCLASS() +{ +} + +void COMPONENTCLASS::paint (Graphics& g) +{ + /* This demo code just fills the component's background and + draws some placeholder text to get you started. + + You should replace everything in this method with your own + drawing code.. + */ + + g.fillAll (Colours::white); // clear the background + + g.setColour (Colours::grey); + g.drawRect (getLocalBounds(), 1); // draw an outline around the component + + g.setColour (Colours::lightblue); + g.setFont (14.0f); + g.drawText ("COMPONENTCLASS", getLocalBounds(), + Justification::centred, true); // draw some placeholder text +} + +void COMPONENTCLASS::resized() +{ + // This method is where you should set the bounds of any child + // components that your component contains.. + +} diff --git a/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.h new file mode 100644 index 0000000000..284f5cad0b --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_NewComponentTemplate.h @@ -0,0 +1,33 @@ +/* + ============================================================================== + + FILENAME + Created: DATE + Author: AUTHOR + + ============================================================================== +*/ + +#ifndef HEADERGUARD +#define HEADERGUARD + +INCLUDE_JUCE + +//============================================================================== +/* +*/ +class COMPONENTCLASS : public Component +{ +public: + COMPONENTCLASS(); + ~COMPONENTCLASS(); + + void paint (Graphics&); + void resized(); + +private: + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS); +}; + + +#endif // HEADERGUARD diff --git a/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp index c3d6a5c445..8278d1ff00 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp +++ b/extras/Introjucer/Source/BinaryData/jucer_NewCppFileTemplate.cpp @@ -8,3 +8,4 @@ ============================================================================== */ +INCLUDE_CORRESPONDING_HEADER \ No newline at end of file diff --git a/extras/Introjucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h new file mode 100644 index 0000000000..7ba7f1f1d8 --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h @@ -0,0 +1,65 @@ +/* + ============================================================================== + + FILENAME + Created: DATE + Author: AUTHOR + + ============================================================================== +*/ + +#ifndef HEADERGUARD +#define HEADERGUARD + +INCLUDE_JUCE + +//============================================================================== +/* +*/ +class COMPONENTCLASS : public Component +{ +public: + COMPONENTCLASS() + { + // In your constructor, you should add any child components, and + // initialise any special settings that your component needs. + + } + + ~COMPONENTCLASS() + { + } + + void paint (Graphics& g) + { + /* This demo code just fills the component's background and + draws some placeholder text to get you started. + + You should replace everything in this method with your own + drawing code.. + */ + + g.fillAll (Colours::white); // clear the background + + g.setColour (Colours::grey); + g.drawRect (getLocalBounds(), 1); // draw an outline around the component + + g.setColour (Colours::lightblue); + g.setFont (14.0f); + g.drawText ("COMPONENTCLASS", getLocalBounds(), + Justification::centred, true); // draw some placeholder text + } + + void resized() + { + // This method is where you should set the bounds of any child + // components that your component contains.. + + } + +private: + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS); +}; + + +#endif // HEADERGUARD diff --git a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp index dfd4b54427..42bc4fdac9 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp +++ b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp @@ -3,20 +3,24 @@ This file was auto-generated! - It contains the basic outline for a simple desktop window. + It contains the basic structure for a simple desktop window. ============================================================================== */ -INCLUDES +INCLUDE_CORRESPONDING_HEADER //============================================================================== WINDOWCLASS::WINDOWCLASS() - : DocumentWindow (JUCEApplication::getInstance()->getApplicationName(), + : DocumentWindow ("WINDOWCLASS", Colours::lightgrey, DocumentWindow::allButtons) { + // At this point you should call setContentOwned() to give the window + // a component containing the content you want to show.. + + centreWithSize (500, 400); setVisible (true); } diff --git a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h index 52832f0ba9..bd9a8784ad 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h +++ b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h @@ -11,7 +11,7 @@ #ifndef HEADERGUARD #define HEADERGUARD -INCLUDES +INCLUDE_JUCE //============================================================================== diff --git a/extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp b/extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp index 512d022235..2c73dfbdd4 100644 --- a/extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp +++ b/extras/Introjucer/Source/Project/jucer_NewFileWizard.cpp @@ -29,21 +29,24 @@ //============================================================================== namespace { - bool fillInNewCppFileTemplate (const File& file, const Project::Item& item, const char* templateName) + inline String fillInBasicTemplateFields (const File& file, const Project::Item& item, const char* templateName) { - String s = item.project.getFileTemplate (templateName) + return item.project.getFileTemplate (templateName) .replace ("FILENAME", file.getFileName(), false) .replace ("DATE", Time::getCurrentTime().toString (true, true, true), false) .replace ("AUTHOR", SystemStats::getFullUserName(), false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (file), false); + .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (file), false) + .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (file.withFileExtension (".h"), file)); + } - return FileHelpers::overwriteFileWithNewDataIfDifferent (file, s); + bool fillInNewCppFileTemplate (const File& file, const Project::Item& item, const char* templateName) + { + return FileHelpers::overwriteFileWithNewDataIfDifferent (file, fillInBasicTemplateFields (file, item, templateName)); } const int menuBaseID = 0x12d83f0; } - //============================================================================== class NewCppFileWizard : public NewFileWizard::Type { @@ -57,12 +60,12 @@ public: const File newFile (askUserToChooseNewFile ("SourceCode.cpp", "*.cpp", parent)); if (newFile != File::nonexistent) - create (parent, newFile); + create (parent, newFile, "jucer_NewCppFileTemplate_cpp"); } - static bool create (Project::Item parent, const File& newFile) + static bool create (Project::Item parent, const File& newFile, const char* templateName) { - if (fillInNewCppFileTemplate (newFile, parent, "jucer_NewCppFileTemplate_cpp")) + if (fillInNewCppFileTemplate (newFile, parent, templateName)) { parent.addFile (newFile, 0, true); return true; @@ -86,12 +89,12 @@ public: const File newFile (askUserToChooseNewFile ("SourceCode.h", "*.h", parent)); if (newFile != File::nonexistent) - create (parent, newFile); + create (parent, newFile, "jucer_NewCppFileTemplate_h"); } - static bool create (Project::Item parent, const File& newFile) + static bool create (Project::Item parent, const File& newFile, const char* templateName) { - if (fillInNewCppFileTemplate (newFile, parent, "jucer_NewCppFileTemplate_h")) + if (fillInNewCppFileTemplate (newFile, parent, templateName)) { parent.addFile (newFile, 0, true); return true; @@ -116,12 +119,91 @@ public: if (newFile != File::nonexistent) { - if (NewHeaderFileWizard::create (parent, newFile.withFileExtension ("h"))) - NewCppFileWizard::create (parent, newFile.withFileExtension ("cpp")); + if (NewCppFileWizard::create (parent, newFile.withFileExtension ("h"), "jucer_NewCppFileTemplate_h")) + NewCppFileWizard::create (parent, newFile.withFileExtension ("cpp"), "jucer_NewCppFileTemplate_cpp"); + } + } +}; + +//============================================================================== +class NewComponentFileWizard : public NewFileWizard::Type +{ +public: + NewComponentFileWizard() {} + + String getName() { return "Component class (split between a CPP & header)"; } + + void createNewFile (Project::Item parent) + { + for (;;) + { + AlertWindow aw (TRANS ("Create new Component class"), + TRANS ("Please enter the name for the new class"), + AlertWindow::NoIcon, nullptr); + + aw.addTextEditor (getClassNameFieldName(), String::empty, String::empty, false); + aw.addButton (TRANS ("Create Files"), 1, KeyPress (KeyPress::returnKey)); + aw.addButton (TRANS ("Cancel"), 0, KeyPress (KeyPress::escapeKey)); + + if (aw.runModalLoop() == 0) + break; + + const String className (aw.getTextEditorContents (getClassNameFieldName()).trim()); + + if (className == CodeHelpers::makeValidIdentifier (className, false, true, false)) + { + const File newFile (askUserToChooseNewFile (className + ".h", "*.h;*.cpp", parent)); + + if (newFile != File::nonexistent) + createFiles (parent, className, newFile); + + break; + } + } + } + + static bool create (const String& className, Project::Item parent, + const File& newFile, const char* templateName) + { + String content = fillInBasicTemplateFields (newFile, parent, templateName) + .replace ("COMPONENTCLASS", className) + .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (parent.project.getAppIncludeFile(), newFile)); + + if (FileHelpers::overwriteFileWithNewDataIfDifferent (newFile, content)) + { + parent.addFile (newFile, 0, true); + return true; } + + showFailedToWriteMessage (newFile); + return false; + } + +private: + virtual void createFiles (Project::Item parent, const String& className, const File& newFile) + { + if (create (className, parent, newFile.withFileExtension ("h"), "jucer_NewComponentTemplate_h")) + create (className, parent, newFile.withFileExtension ("cpp"), "jucer_NewComponentTemplate_cpp"); + } + + static String getClassNameFieldName() { return "Class Name"; } +}; + +//============================================================================== +class NewSingleFileComponentFileWizard : public NewComponentFileWizard +{ +public: + NewSingleFileComponentFileWizard() {} + + String getName() { return "Component class (in a single source file)"; } + + void createFiles (Project::Item parent, const String& className, const File& newFile) + { + create (className, parent, newFile.withFileExtension ("h"), "jucer_NewInlineComponentTemplate_h"); } }; + //============================================================================== void NewFileWizard::Type::showFailedToWriteMessage (const File& file) { @@ -151,6 +233,8 @@ NewFileWizard::NewFileWizard() registerWizard (new NewCppFileWizard()); registerWizard (new NewHeaderFileWizard()); registerWizard (new NewCppAndHeaderFileWizard()); + registerWizard (new NewComponentFileWizard()); + registerWizard (new NewSingleFileComponentFileWizard()); } NewFileWizard::~NewFileWizard() diff --git a/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp index 897026bb8b..2117353295 100644 --- a/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp +++ b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp @@ -116,17 +116,18 @@ public: if (createWindow) { appHeaders << newLine << CodeHelpers::createIncludeStatement (mainWindowH, mainCppFile); - initCode = "mainWindow = new " + windowClassName + "();"; - shutdownCode = "mainWindow = 0;"; + initCode = "mainWindow = new " + windowClassName + "();"; + shutdownCode = "mainWindow = nullptr;"; privateMembers = "ScopedPointer <" + windowClassName + "> mainWindow;"; String windowH = project.getFileTemplate ("jucer_WindowTemplate_h") - .replace ("INCLUDES", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainWindowH), false) + .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainWindowH), false) .replace ("WINDOWCLASS", windowClassName, false) .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (mainWindowH), false); String windowCpp = project.getFileTemplate ("jucer_WindowTemplate_cpp") - .replace ("INCLUDES", CodeHelpers::createIncludeStatement (mainWindowH, mainWindowCpp), false) + .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainWindowCpp), false) + .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (mainWindowH, mainWindowCpp), false) .replace ("WINDOWCLASS", windowClassName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainWindowH, windowH)) diff --git a/modules/juce_gui_basics/application/juce_Initialisation.h b/modules/juce_gui_basics/application/juce_Initialisation.h index 60f693bd44..e577a9eac4 100644 --- a/modules/juce_gui_basics/application/juce_Initialisation.h +++ b/modules/juce_gui_basics/application/juce_Initialisation.h @@ -63,8 +63,6 @@ JUCE_API void JUCE_CALLTYPE shutdownJuce_GUI(); This class is particularly handy to use at the beginning of a console app's main() function, because it'll take care of shutting down whenever you return from the main() call. - - @see ScopedJuceInitialiser_NonGUI */ class ScopedJuceInitialiser_GUI { diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp index ae6fbcca9a..892d5b3e14 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp @@ -230,7 +230,7 @@ void FileChooserDialogBox::createNewFolderCallback (int result, FileChooserDialo if (result != 0 && alert != nullptr && box != nullptr) { alert->setVisible (false); - box->createNewFolderConfirmed (alert->getTextEditorContents ("name")); + box->createNewFolderConfirmed (alert->getTextEditorContents ("Folder Name")); } } @@ -244,9 +244,9 @@ void FileChooserDialogBox::createNewFolder() TRANS("Please enter the name for the folder"), AlertWindow::NoIcon, this); - aw->addTextEditor ("name", String::empty, String::empty, false); - aw->addButton (TRANS("ok"), 1, KeyPress (KeyPress::returnKey)); - aw->addButton (TRANS("cancel"), 0, KeyPress (KeyPress::escapeKey)); + aw->addTextEditor ("Folder Name", String::empty, String::empty, false); + aw->addButton (TRANS("Create Folder"), 1, KeyPress (KeyPress::returnKey)); + aw->addButton (TRANS("Cancel"), 0, KeyPress (KeyPress::escapeKey)); aw->enterModalState (true, ModalCallbackFunction::forComponent (createNewFolderCallback, this, diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp index 8f7bb686fd..f8cbc9637c 100644 --- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp +++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp @@ -821,5 +821,5 @@ void Toolbar::showCustomisationDialog (ToolbarItemFactory& factory, const int op setEditingActive (true); (new CustomisationDialog (factory, this, optionFlags)) - ->enterModalState (true, 0, true); + ->enterModalState (true, nullptr, true); }