diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index f725bd5346..2c69db5d66 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -70,7 +70,6 @@ 06411E446478986E7E65FE6B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ShapeButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ShapeButton.h"; sourceTree = "SOURCE_ROOT"; }; 07EF1095F6D45A29AF2A6B6F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBrowserListener.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h"; sourceTree = "SOURCE_ROOT"; }; 0819B9CBFBA5F410C41C978A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FilenameComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h"; sourceTree = "SOURCE_ROOT"; }; - 087959CCC447DA59FBD5787E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_WindowTemplate.cpp"; path = "../../Source/BinaryData/jucer_WindowTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; 08ADF7FC9BBE70F3C8186215 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentListener.h"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.h"; sourceTree = "SOURCE_ROOT"; }; 08D19EE7C17DCED7E7BBEEE7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileInputStream.cpp"; path = "../../../../modules/juce_core/files/juce_FileInputStream.cpp"; sourceTree = "SOURCE_ROOT"; }; 0906A934A2797145A64FF423 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TooltipWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -90,7 +89,6 @@ 0F2505BCD0232EB95D5199F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../../../modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; }; 0F382FC6B16658EF02D2C4F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MessageListener.cpp"; path = "../../../../modules/juce_events/messages/juce_MessageListener.cpp"; sourceTree = "SOURCE_ROOT"; }; 0FAA46FE4A661AC6F65896CE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PathIterator.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_PathIterator.cpp"; sourceTree = "SOURCE_ROOT"; }; - 0FC137539030B1A9152F680C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; 1039ABBDCC86BDC9D2663017 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlElement.h"; path = "../../../../modules/juce_core/xml/juce_XmlElement.h"; sourceTree = "SOURCE_ROOT"; }; 1116222363E600327FC672A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageManager.h"; path = "../../../../modules/juce_events/messages/juce_MessageManager.h"; sourceTree = "SOURCE_ROOT"; }; 117B5BB797DEC16E103A08F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MouseInputSource.cpp"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -210,6 +208,7 @@ 35AF9D5F0603CF6CE2D355A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeCoordinatePositioner.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.cpp"; sourceTree = "SOURCE_ROOT"; }; 35BF11530EF0D771FD94ABDC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextDragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_TextDragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; }; 35CB48D497F35BF3F6998F5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExporter.h"; path = "../../Source/Project Saving/jucer_ProjectExporter.h"; sourceTree = "SOURCE_ROOT"; }; + 35E6EE1E98DD7050DDFECD9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ContentCompTemplate.h"; path = "../../Source/BinaryData/jucer_ContentCompTemplate.h"; sourceTree = "SOURCE_ROOT"; }; 364D1A9B113320407A7E57B9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; 37A0A38C2B5825B9A302879C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedArray.h"; path = "../../../../modules/juce_core/containers/juce_ReferenceCountedArray.h"; sourceTree = "SOURCE_ROOT"; }; 3804BE13635F779ACB8C5491 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LassoComponent.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_LassoComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -391,7 +390,6 @@ 7D264E60AC701D3736527D8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponentPeer.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm"; sourceTree = "SOURCE_ROOT"; }; 7D50F21E9F18C152C9C662D5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentBuilder.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBuilder.h"; sourceTree = "SOURCE_ROOT"; }; 7DCAE585F301C5591F96AF99 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseEvent.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseEvent.h"; sourceTree = "SOURCE_ROOT"; }; - 7DF304ACC22704A1B2454B68 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_WindowTemplate.h"; path = "../../Source/BinaryData/jucer_WindowTemplate.h"; sourceTree = "SOURCE_ROOT"; }; 7E0C5AFB74461AC174941BDD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandManager.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h"; sourceTree = "SOURCE_ROOT"; }; 7E3ACAD10381DA0D81093329 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ElementComparator.h"; path = "../../../../modules/juce_core/containers/juce_ElementComparator.h"; sourceTree = "SOURCE_ROOT"; }; 7E45364D59D84EF762F1A928 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryBlock.h"; path = "../../../../modules/juce_core/memory/juce_MemoryBlock.h"; sourceTree = "SOURCE_ROOT"; }; @@ -421,6 +419,7 @@ 86AE1EDF78EBEE3B5E25B419 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/json/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; }; 86DADC3D8463C21DF2751EA6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_UIViewComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h"; sourceTree = "SOURCE_ROOT"; }; 86E468DE6556BB2AD76A3D80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectContentComponent.cpp"; path = "../../Source/Project/jucer_ProjectContentComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; + 86E8A40E5A83781A8478454D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_Window.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate_Window.cpp"; sourceTree = "SOURCE_ROOT"; }; 8702F43110E4CCA5E5F827F5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; 8803733D62CD6DE90727BCA0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_cryptography.h"; path = "../../../../modules/juce_cryptography/juce_cryptography.h"; sourceTree = "SOURCE_ROOT"; }; 882E28FED1A99E73B0035FC8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; }; @@ -453,6 +452,7 @@ 9539EC08D70D4719A89A4A30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_gui_extra.mm"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; }; 953ECF85818382C60F49544B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AffineTransform.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"; sourceTree = "SOURCE_ROOT"; }; 95CAB4F09E05FDBAED45812E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; }; + 9683B04CA3BD7F73E8236FE2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ContentCompTemplate.cpp"; path = "../../Source/BinaryData/jucer_ContentCompTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; 96972221C7D4CB0FCD5C3E2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ModalComponentManager.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.cpp"; sourceTree = "SOURCE_ROOT"; }; 96C105A8CFFC54B429A5B822 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DocumentWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h"; sourceTree = "SOURCE_ROOT"; }; 9718703E5D696761B85D25B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileChooserDialogBox.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h"; sourceTree = "SOURCE_ROOT"; }; @@ -531,6 +531,7 @@ AD3C946C260F68C4AD2B491F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationProperties.h"; path = "../../../../modules/juce_data_structures/app_properties/juce_ApplicationProperties.h"; sourceTree = "SOURCE_ROOT"; }; AD44FFB01387088222D0E98F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyMappingEditorComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; AE1786BA679872921797AE25 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; }; + AE1BC6DCCFC1A18E2ACE23F1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_NoWindow.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate_NoWindow.cpp"; sourceTree = "SOURCE_ROOT"; }; AE3E427DBCC8D50E3F356402 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentMovementWatcher.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h"; sourceTree = "SOURCE_ROOT"; }; AE84254C46407F84EB70A370 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h"; sourceTree = "SOURCE_ROOT"; }; AEE6CA38BE01F8C61920C203 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyPressMappingSet.h"; path = "../../../../modules/juce_gui_basics/commands/juce_KeyPressMappingSet.h"; sourceTree = "SOURCE_ROOT"; }; @@ -611,6 +612,7 @@ 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"; }; 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"; }; @@ -622,6 +624,7 @@ 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"; }; @@ -631,7 +634,6 @@ D00F311BFC3C2625C457CB9B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; D0F1614CC861E8E0B59B7A06 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Messaging.cpp"; path = "../../../../modules/juce_events/native/juce_linux_Messaging.cpp"; sourceTree = "SOURCE_ROOT"; }; D10D51A0A2D63F38B4D86A60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceFile.cpp"; path = "../../Source/Project Saving/jucer_ResourceFile.cpp"; sourceTree = "SOURCE_ROOT"; }; - 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"; }; D2F80DA0946A5EE01FC016CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_UTF32.h"; path = "../../../../modules/juce_core/text/juce_CharPointer_UTF32.h"; sourceTree = "SOURCE_ROOT"; }; @@ -652,13 +654,11 @@ 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"; }; 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"; }; + D141433D3FE81F20490DE928 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Desktop.h"; path = "../../../../modules/juce_gui_basics/components/juce_Desktop.h"; 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"; }; @@ -679,6 +679,7 @@ DFC6364D81D9C60BD4CA9D12 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeTime.cpp"; path = "../../../../modules/juce_core/time/juce_RelativeTime.cpp"; sourceTree = "SOURCE_ROOT"; }; E07C56267CBB46FC44EF2026 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Image.cpp"; path = "../../../../modules/juce_graphics/images/juce_Image.cpp"; sourceTree = "SOURCE_ROOT"; }; E1C16C872E34BCB144B469F9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_EdgeTable.h"; path = "../../../../modules/juce_graphics/geometry/juce_EdgeTable.h"; sourceTree = "SOURCE_ROOT"; }; + E2374E15D65425C4101237E2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewComponentTemplate.h"; path = "../../Source/BinaryData/jucer_NewComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; }; E27F0860F27023BAA9798B46 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Rectangle.h"; path = "../../../../modules/juce_graphics/geometry/juce_Rectangle.h"; sourceTree = "SOURCE_ROOT"; }; E284B565DBD647DC0830D23B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ButtonPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; E2C1C995D554A3F0A363CE58 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Thread.h"; path = "../../../../modules/juce_core/threads/juce_Thread.h"; sourceTree = "SOURCE_ROOT"; }; @@ -840,15 +841,16 @@ AFF72BA2B130F3F9AC029080, 65F4749184C84C2FDBB4C305, 03D3053EDE47FED1919C6674, + 9683B04CA3BD7F73E8236FE2, + 35E6EE1E98DD7050DDFECD9B, 18D9EBA1DAE45EEF81FD5C8F, - 0FC137539030B1A9152F680C, + AE1BC6DCCFC1A18E2ACE23F1, + 86E8A40E5A83781A8478454D, 61BE37E2B26C25056D9E8FE2, E2374E15D65425C4101237E2, CF8011B3C67B609032974DA5, 53151B683E11F420203E61C2, - F7CAB5BC15EE351949D3F2C3, - 087959CCC447DA59FBD5787E, - 7DF304ACC22704A1B2454B68 ); name = BinaryData; sourceTree = ""; }; + F7CAB5BC15EE351949D3F2C3 ); name = BinaryData; sourceTree = ""; }; D3109994DA6AD871BE85C4E2 = { isa = PBXGroup; children = ( ACBAFA7D92DD82AD44ABE68A, 891F84627A03FA733F37A199, diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index e6aa6e3d24..c2cee1b876 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -287,7 +287,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -367,7 +367,17 @@ - + + + + + + + + + diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj index 5a10e8d117..3e9f5d5011 100644 --- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj @@ -287,7 +287,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -367,7 +367,17 @@ - + + + + + + + + + diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj index 6b834e072f..11466394ad 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj @@ -157,19 +157,22 @@ true + + true + true - + true - + true - + true - + true @@ -1017,10 +1020,10 @@ + - diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters index 711ce754ae..bdd0550bec 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters @@ -310,19 +310,22 @@ The Introjucer\BinaryData + + The Introjucer\BinaryData + The Introjucer\BinaryData - + The Introjucer\BinaryData - + The Introjucer\BinaryData - + The Introjucer\BinaryData - + The Introjucer\BinaryData @@ -1332,6 +1335,9 @@ The Introjucer\BinaryData + + The Introjucer\BinaryData + The Introjucer\BinaryData @@ -1341,9 +1347,6 @@ The Introjucer\BinaryData - - The Introjucer\BinaryData - Juce Modules\juce_core\text diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer index caebf159f5..898b8dee0a 100644 --- a/extras/Introjucer/Introjucer.jucer +++ b/extras/Introjucer/Introjucer.jucer @@ -220,10 +220,16 @@ resource="1" file="Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp"/> + + - + + - - systemRequestedQuit();\r\n" +" }\r\n" +"\r\n" +" /* Note: Be careful if you override any DocumentWindow methods - the base\r\n" +" class uses a lot of them, so by overriding you might break its functionality.\r\n" +" It's best to do all your work in your content component instead, but if\r\n" +" you really have to override any DocumentWindow methods, make sure your\r\n" +" subclass also calls the superclass's method.\r\n" +" */\r\n" +"\r\n" +" private:\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow);\r\n" +" };\r\n" +"\r\n" "private:\r\n" -" PRIVATEMEMBERS\r\n" +" ScopedPointer mainWindow;\r\n" "};\r\n" "\r\n" "//==============================================================================\r\n" -"// This macro generates the main() routine that starts the app.\r\n" +"// This macro generates the main() routine that launches the app.\r\n" "START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; -const char* jucer_MainTemplate_cpp = (const char*) temp_292512d9; +const char* jucer_MainTemplate_Window_cpp = (const char*) temp_b2f1a7c0; //================== jucer_NewComponentTemplate.cpp ================== static const unsigned char temp_e0f76d5d[] = @@ -787,92 +954,6 @@ static const unsigned char temp_627c3689[] = const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_627c3689; -//================== jucer_WindowTemplate.cpp ================== -static const unsigned char temp_6fd7e50[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic structure for a simple desktop window.\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" -"\r\n" -"\r\n" -"//==============================================================================\r\n" -"WINDOWCLASS::WINDOWCLASS()\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" -"\r\n" -"WINDOWCLASS::~WINDOWCLASS()\r\n" -"{\r\n" -"}\r\n" -"\r\n" -"void WINDOWCLASS::closeButtonPressed()\r\n" -"{\r\n" -" JUCEApplication::getInstance()->systemRequestedQuit();\r\n" -"}\r\n"; - -const char* jucer_WindowTemplate_cpp = (const char*) temp_6fd7e50; - -//================== jucer_WindowTemplate.h ================== -static const unsigned char temp_613d4455[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic outline for a simple desktop window.\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" -"\r\n" -"INCLUDE_JUCE\r\n" -"\r\n" -"\r\n" -"//==============================================================================\r\n" -"class WINDOWCLASS : public DocumentWindow\r\n" -"{\r\n" -"public:\r\n" -" //==============================================================================\r\n" -" WINDOWCLASS();\r\n" -" ~WINDOWCLASS();\r\n" -"\r\n" -" void closeButtonPressed();\r\n" -"\r\n" -"\r\n" -" /* Note: Be careful when overriding DocumentWindow methods - the base class\r\n" -" uses a lot of them, so by overriding you might break its functionality.\r\n" -" It's best to do all your work in you content component instead, but if\r\n" -" you really have to override any DocumentWindow methods, make sure your\r\n" -" implementation calls the superclass's method.\r\n" -" */\r\n" -"\r\n" -"private:\r\n" -" //==============================================================================\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WINDOWCLASS)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; - -const char* jucer_WindowTemplate_h = (const char*) temp_613d4455; - const char* getNamedResource (const char*, int&) throw(); const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw() @@ -892,15 +973,16 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x4d0721bf: numBytes = 799; return jucer_AudioPluginEditorTemplate_h; case 0x51b49ac5: numBytes = 4473; return jucer_AudioPluginFilterTemplate_cpp; case 0x488afa0a: numBytes = 2400; return jucer_AudioPluginFilterTemplate_h; + case 0x0b66646c: numBytes = 886; return jucer_ContentCompTemplate_cpp; + case 0x6fa10171: numBytes = 924; return jucer_ContentCompTemplate_h; case 0x8905395b: numBytes = 470; return jucer_MainConsoleAppTemplate_cpp; - case 0x7a0186b1: numBytes = 1742; return jucer_MainTemplate_cpp; + case 0x5e5ea047: numBytes = 1947; return jucer_MainTemplate_NoWindow_cpp; + case 0x400bc026: numBytes = 3614; return jucer_MainTemplate_Window_cpp; case 0xf4842835: numBytes = 1389; return jucer_NewComponentTemplate_cpp; case 0xe7bf237a: numBytes = 649; return jucer_NewComponentTemplate_h; case 0x02a2a077: numBytes = 260; return jucer_NewCppFileTemplate_cpp; case 0x0842c43c: numBytes = 308; return jucer_NewCppFileTemplate_h; case 0x36e634a1: numBytes = 1627; return jucer_NewInlineComponentTemplate_h; - case 0x3f052be8: numBytes = 905; return jucer_WindowTemplate_cpp; - case 0xb20377ed: numBytes = 1220; return jucer_WindowTemplate_h; default: break; } diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.h b/extras/Introjucer/JuceLibraryCode/BinaryData.h index f22013f037..bdc3933853 100644 --- a/extras/Introjucer/JuceLibraryCode/BinaryData.h +++ b/extras/Introjucer/JuceLibraryCode/BinaryData.h @@ -30,11 +30,20 @@ namespace BinaryData extern const char* jucer_AudioPluginFilterTemplate_h; const int jucer_AudioPluginFilterTemplate_hSize = 2400; + extern const char* jucer_ContentCompTemplate_cpp; + const int jucer_ContentCompTemplate_cppSize = 886; + + extern const char* jucer_ContentCompTemplate_h; + const int jucer_ContentCompTemplate_hSize = 924; + extern const char* jucer_MainConsoleAppTemplate_cpp; const int jucer_MainConsoleAppTemplate_cppSize = 470; - extern const char* jucer_MainTemplate_cpp; - const int jucer_MainTemplate_cppSize = 1742; + extern const char* jucer_MainTemplate_NoWindow_cpp; + const int jucer_MainTemplate_NoWindow_cppSize = 1947; + + extern const char* jucer_MainTemplate_Window_cpp; + const int jucer_MainTemplate_Window_cppSize = 3614; extern const char* jucer_NewComponentTemplate_cpp; const int jucer_NewComponentTemplate_cppSize = 1389; @@ -51,12 +60,6 @@ namespace BinaryData extern const char* jucer_NewInlineComponentTemplate_h; const int jucer_NewInlineComponentTemplate_hSize = 1627; - extern const char* jucer_WindowTemplate_cpp; - const int jucer_WindowTemplate_cppSize = 905; - - extern const char* jucer_WindowTemplate_h; - 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). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); diff --git a/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.cpp new file mode 100644 index 0000000000..a6e5d29ff4 --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.cpp @@ -0,0 +1,36 @@ +/* + ============================================================================== + + This file was auto-generated! + + ============================================================================== +*/ + +INCLUDE_CORRESPONDING_HEADER + + +//============================================================================== +CONTENTCOMPCLASS::CONTENTCOMPCLASS() +{ + setSize (500, 400); +} + +CONTENTCOMPCLASS::~CONTENTCOMPCLASS() +{ +} + +void CONTENTCOMPCLASS::paint (Graphics& g) +{ + g.fillAll (Colour (0xffeeddff)); + + g.setFont (Font (16.0f)); + g.setColour (Colours::black); + g.drawText ("Hello World!", getLocalBounds(), Justification::centred, true); +} + +void CONTENTCOMPCLASS::resized() +{ + // This is called when the CONTENTCOMPCLASS is resized. + // If you add any child components, this is where you should + // update their positions. +} diff --git a/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.h new file mode 100644 index 0000000000..868e6a9516 --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_ContentCompTemplate.h @@ -0,0 +1,36 @@ +/* + ============================================================================== + + This file was auto-generated! + + ============================================================================== +*/ + +#ifndef HEADERGUARD +#define HEADERGUARD + +INCLUDE_JUCE + + +//============================================================================== +/* + This component lives inside our window, and this is where you should put all + your controls and content. +*/ +class CONTENTCOMPCLASS : public Component +{ +public: + //============================================================================== + CONTENTCOMPCLASS(); + ~CONTENTCOMPCLASS(); + + void paint (Graphics&); + void resized(); + +private: + //============================================================================== + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) +}; + + +#endif // HEADERGUARD diff --git a/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate_NoWindow.cpp similarity index 59% rename from extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp rename to extras/Introjucer/Source/BinaryData/jucer_MainTemplate_NoWindow.cpp index f133a9a4c8..1b793fcb44 100644 --- a/extras/Introjucer/Source/BinaryData/jucer_MainTemplate.cpp +++ b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate_NoWindow.cpp @@ -16,57 +16,39 @@ class APPCLASSNAME : public JUCEApplication { public: //============================================================================== - APPCLASSNAME()MEMBERINITIALISERS - { - } + APPCLASSNAME() {} - ~APPCLASSNAME() - { - } + const String getApplicationName() { return ProjectInfo::projectName; } + const String getApplicationVersion() { return ProjectInfo::versionString; } + bool moreThanOneInstanceAllowed() { return ALLOWMORETHANONEINSTANCE; } //============================================================================== void initialise (const String& commandLine) { // Add your application's initialisation code here.. - APPINITCODE } void shutdown() { // Add your application's shutdown code here.. - APPSHUTDOWNCODE } //============================================================================== void systemRequestedQuit() { + // This is called when the app is being asked to quit: you can ignore this + // request and let the app carry on running, or call quit() to allow the app to close. quit(); } - const String getApplicationName() - { - return "APPNAME"; - } - - const String getApplicationVersion() - { - return ProjectInfo::versionString; - } - - bool moreThanOneInstanceAllowed() - { - return ALLOWMORETHANONEINSTANCE; - } - void anotherInstanceStarted (const String& commandLine) { - ANOTHERINSTANCECODE + // When another instance of the app is launched while this one is running, + // this method is invoked, and the commandLine parameter tells you what + // the other instance's command-line arguments were. } - -private: - PRIVATEMEMBERS }; //============================================================================== -// This macro generates the main() routine that starts the app. +// This macro generates the main() routine that launches the app. START_JUCE_APPLICATION (APPCLASSNAME) diff --git a/extras/Introjucer/Source/BinaryData/jucer_MainTemplate_Window.cpp b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate_Window.cpp new file mode 100644 index 0000000000..ca53fc12ee --- /dev/null +++ b/extras/Introjucer/Source/BinaryData/jucer_MainTemplate_Window.cpp @@ -0,0 +1,98 @@ +/* + ============================================================================== + + This file was auto-generated by the Introjucer! + + It contains the basic startup code for a Juce application. + + ============================================================================== +*/ + +APPHEADERS + + +//============================================================================== +class APPCLASSNAME : public JUCEApplication +{ +public: + //============================================================================== + APPCLASSNAME() {} + + const String getApplicationName() { return ProjectInfo::projectName; } + const String getApplicationVersion() { return ProjectInfo::versionString; } + bool moreThanOneInstanceAllowed() { return ALLOWMORETHANONEINSTANCE; } + + //============================================================================== + void initialise (const String& commandLine) + { + // This method is where you should put your application's initialisation code.. + + mainWindow = new MainWindow(); + } + + void shutdown() + { + // Add your application's shutdown code here.. + + mainWindow = nullptr; // (deletes our window) + } + + //============================================================================== + void systemRequestedQuit() + { + // This is called when the app is being asked to quit: you can ignore this + // request and let the app carry on running, or call quit() to allow the app to close. + quit(); + } + + void anotherInstanceStarted (const String& commandLine) + { + // When another instance of the app is launched while this one is running, + // this method is invoked, and the commandLine parameter tells you what + // the other instance's command-line arguments were. + } + + //============================================================================== + /* + This class implements the desktop window that contains an instance of + our CONTENTCOMPCLASS class. + */ + class MainWindow : public DocumentWindow + { + public: + MainWindow() : DocumentWindow ("MainWindow", + Colours::lightgrey, + DocumentWindow::allButtons) + { + setContentOwned (new CONTENTCOMPCLASS(), true); + + centreWithSize (getWidth(), getHeight()); + setVisible (true); + } + + void closeButtonPressed() + { + // This is called when the user tries to close this window. Here, we'll just + // ask the app to quit when this happens, but you can change this to do + // whatever you need. + JUCEApplication::getInstance()->systemRequestedQuit(); + } + + /* Note: Be careful if you override any DocumentWindow methods - the base + class uses a lot of them, so by overriding you might break its functionality. + It's best to do all your work in your content component instead, but if + you really have to override any DocumentWindow methods, make sure your + subclass also calls the superclass's method. + */ + + private: + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow); + }; + +private: + ScopedPointer mainWindow; +}; + +//============================================================================== +// This macro generates the main() routine that launches the app. +START_JUCE_APPLICATION (APPCLASSNAME) diff --git a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp deleted file mode 100644 index 42bc4fdac9..0000000000 --- a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - ============================================================================== - - This file was auto-generated! - - It contains the basic structure for a simple desktop window. - - ============================================================================== -*/ - -INCLUDE_CORRESPONDING_HEADER - - -//============================================================================== -WINDOWCLASS::WINDOWCLASS() - : 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); -} - -WINDOWCLASS::~WINDOWCLASS() -{ -} - -void WINDOWCLASS::closeButtonPressed() -{ - JUCEApplication::getInstance()->systemRequestedQuit(); -} diff --git a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h b/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h deleted file mode 100644 index bd9a8784ad..0000000000 --- a/extras/Introjucer/Source/BinaryData/jucer_WindowTemplate.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - ============================================================================== - - This file was auto-generated! - - It contains the basic outline for a simple desktop window. - - ============================================================================== -*/ - -#ifndef HEADERGUARD -#define HEADERGUARD - -INCLUDE_JUCE - - -//============================================================================== -class WINDOWCLASS : public DocumentWindow -{ -public: - //============================================================================== - WINDOWCLASS(); - ~WINDOWCLASS(); - - void closeButtonPressed(); - - - /* Note: Be careful when overriding DocumentWindow methods - the base class - uses a lot of them, so by overriding you might break its functionality. - It's best to do all your work in you content component instead, but if - you really have to override any DocumentWindow methods, make sure your - implementation calls the superclass's method. - */ - -private: - //============================================================================== - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WINDOWCLASS) -}; - - -#endif // HEADERGUARD diff --git a/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp index dce917bebc..f9513bb1ba 100644 --- a/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp +++ b/extras/Introjucer/Source/Project/jucer_NewProjectWizard.cpp @@ -95,10 +95,10 @@ public: if (! getSourceFilesFolder().createDirectory()) failedFiles.add (getSourceFilesFolder().getFullPathName()); - File mainCppFile = getSourceFilesFolder().getChildFile ("Main.cpp"); - File mainWindowCpp = getSourceFilesFolder().getChildFile ("MainWindow.cpp"); - File mainWindowH = mainWindowCpp.withFileExtension (".h"); - String windowClassName = "MainAppWindow"; + File mainCppFile = getSourceFilesFolder().getChildFile ("Main.cpp"); + File contentCompCpp = getSourceFilesFolder().getChildFile ("MainComponent.cpp"); + File contentCompH = contentCompCpp.withFileExtension (".h"); + String contentCompName = "MainContentComponent"; project.getProjectTypeValue() = ProjectType::getGUIAppTypeName(); @@ -107,48 +107,40 @@ public: setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); - String initCode, shutdownCode, anotherInstanceStartedCode, privateMembers, memberInitialisers; if (createWindow) { - appHeaders << newLine << CodeHelpers::createIncludeStatement (mainWindowH, mainCppFile); - initCode = "mainWindow = new " + windowClassName + "();"; - shutdownCode = "mainWindow = nullptr;"; - privateMembers = "ScopedPointer <" + windowClassName + "> mainWindow;"; + appHeaders << newLine << CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); - String windowH = project.getFileTemplate ("jucer_WindowTemplate_h") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainWindowH), false) - .replace ("WINDOWCLASS", windowClassName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (mainWindowH), false); + String windowH = project.getFileTemplate ("jucer_ContentCompTemplate_h") + .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("CONTENTCOMPCLASS", contentCompName, false) + .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (contentCompH), false); - String windowCpp = project.getFileTemplate ("jucer_WindowTemplate_cpp") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainWindowCpp), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (mainWindowH, mainWindowCpp), false) - .replace ("WINDOWCLASS", windowClassName, false); + String windowCpp = project.getFileTemplate ("jucer_ContentCompTemplate_cpp") + .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) + .replace ("CONTENTCOMPCLASS", contentCompName, false); - if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainWindowH, windowH)) - failedFiles.add (mainWindowH.getFullPathName()); + if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) + failedFiles.add (contentCompH.getFullPathName()); - if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainWindowCpp, windowCpp)) - failedFiles.add (mainWindowCpp.getFullPathName()); + if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp)) + failedFiles.add (contentCompCpp.getFullPathName()); - sourceGroup.addFile (mainWindowCpp, -1, true); - sourceGroup.addFile (mainWindowH, -1, false); + sourceGroup.addFile (contentCompCpp, -1, true); + sourceGroup.addFile (contentCompH, -1, false); } if (createMainCpp) { - String mainCpp = project.getFileTemplate ("jucer_MainTemplate_cpp") + String mainCpp = project.getFileTemplate (createWindow ? "jucer_MainTemplate_Window_cpp" + : "jucer_MainTemplate_NoWindow_cpp") .replace ("APPHEADERS", appHeaders, false) .replace ("APPCLASSNAME", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) - .replace ("MEMBERINITIALISERS", memberInitialisers, false) - .replace ("APPINITCODE", initCode, false) - .replace ("APPSHUTDOWNCODE", shutdownCode, false) .replace ("APPNAME", CodeHelpers::addEscapeChars (appTitle), false) - .replace ("APPVERSION", "1.0", false) - .replace ("ALLOWMORETHANONEINSTANCE", "true", false) - .replace ("ANOTHERINSTANCECODE", anotherInstanceStartedCode, false) - .replace ("PRIVATEMEMBERS", privateMembers, false); + .replace ("CONTENTCOMPCLASS", contentCompName, false) + .replace ("ALLOWMORETHANONEINSTANCE", "true", false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); @@ -470,6 +462,7 @@ public: createButton.addListener (this); addChildAndSetID (&cancelButton, "cancelButton"); + cancelButton.addShortcut (KeyPress (KeyPress::escapeKey)); cancelButton.setBounds ("right - 140, createButton.top, createButton.left - 10, createButton.bottom"); cancelButton.addListener (this);