diff --git a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj index a72a754a82..989d918211 100644 --- a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj @@ -75,6 +75,7 @@ 053838409E82E7D7722F7404 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = vorbisenc.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/vorbisenc.h"; sourceTree = "SOURCE_ROOT"; }; 0589532FD9A73AE783AEAFF9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionListener.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionListener.h"; sourceTree = "SOURCE_ROOT"; }; 05C14DEEE0E3BDC4049484B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RTAS_DigiCode1.cpp"; path = "../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = "SOURCE_ROOT"; }; + 05E748FAB3D311D0B3D8DA84 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0614ED95FE4A34757F366F06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_X11_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 06580FB07A43DEC6C8295BA6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_plugin_client_VST_utils.mm"; path = "../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; 066F37651C7F3792917C2F8E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GlowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_GlowEffect.h"; sourceTree = "SOURCE_ROOT"; }; @@ -878,6 +879,7 @@ A7B823112D6BED3312715735 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAXException.h; path = "../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAXException.h"; sourceTree = "SOURCE_ROOT"; }; A7D9A07B7B44888CF960B9B4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; A7EDF8FF797D5C22FE78BAE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcmaster.c"; sourceTree = "SOURCE_ROOT"; }; + A81966C0F4542F7C5DAF5BBF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A8209DFA6D320A6BD9BBDB48 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = analysis.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/analysis.c"; sourceTree = "SOURCE_ROOT"; }; A8315F08B794D9C87328F17F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_plugin_client_VST_utils.mm"; path = "../../JuceLibraryCode/juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; A85FEFF5F978F3B76D9829C1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PropertySet.h"; path = "../../../../modules/juce_core/containers/juce_PropertySet.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2714,7 +2716,8 @@ 5BDF2D3ACDBBCAA8E2BD4803 = {isa = PBXGroup; children = ( D43C762F1355546820373F14, 7B351E0CEB9BE04BE1F04AF5, - 35331E7E5F8892DF428E5E14, ); name = embedding; sourceTree = ""; }; + 35331E7E5F8892DF428E5E14, + 05E748FAB3D311D0B3D8DA84, ); name = embedding; sourceTree = ""; }; 3496C854B0BD70F6304A1724 = {isa = PBXGroup; children = ( F895132C805C3C8187536E4C, 2024F0516E5DB6817D115CE3, @@ -2741,6 +2744,7 @@ 7E838C96F00848B2EE6E2F72, 563DED873ACBEF1E48CDCD13, 0614ED95FE4A34757F366F06, + A81966C0F4542F7C5DAF5BBF, 15D7465655AABF4F6BBA81CF, 0C5C43B5677B8F335F364B14, 98305AA6513DCC298E322C0B, @@ -3327,7 +3331,7 @@ 4D9D92DD454BB03746241196, ); runOnlyForDeploymentPostprocessing = 0; }; CD6892FED0DB19C0DDD9AD37 = {isa = PBXNativeTarget; buildConfigurationList = AF907C78A0D17B741F5F8944; buildPhases = ( 1F4A8812AAE49E02F3215F48, ); buildRules = ( ); dependencies = ( ); name = "AUv3Synth - Shared Code"; productName = AUv3Synth; productReference = 9536B5A780A03F6BACB24144; productType = "com.apple.product-type.library.static"; }; - D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };73F4C13CDCAC7EE5914F2E61 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };386D3CCDC878EC299C56FB39 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 73F4C13CDCAC7EE5914F2E61, 386D3CCDC878EC299C56FB39, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; + D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };73F4C13CDCAC7EE5914F2E61 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };386D3CCDC878EC299C56FB39 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 73F4C13CDCAC7EE5914F2E61, 386D3CCDC878EC299C56FB39, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; }; rootObject = D0E003364F0BE3205BD9243E; } diff --git a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj index 554b2c7718..186debe805 100644 --- a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj @@ -70,6 +70,7 @@ 053838409E82E7D7722F7404 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = vorbisenc.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/vorbisenc.h"; sourceTree = "SOURCE_ROOT"; }; 0589532FD9A73AE783AEAFF9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionListener.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionListener.h"; sourceTree = "SOURCE_ROOT"; }; 05C14DEEE0E3BDC4049484B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RTAS_DigiCode1.cpp"; path = "../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = "SOURCE_ROOT"; }; + 05E748FAB3D311D0B3D8DA84 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0614ED95FE4A34757F366F06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_X11_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 06580FB07A43DEC6C8295BA6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_plugin_client_VST_utils.mm"; path = "../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; 066F37651C7F3792917C2F8E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GlowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_GlowEffect.h"; sourceTree = "SOURCE_ROOT"; }; @@ -867,6 +868,7 @@ A7B823112D6BED3312715735 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAXException.h; path = "../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAXException.h"; sourceTree = "SOURCE_ROOT"; }; A7D9A07B7B44888CF960B9B4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; A7EDF8FF797D5C22FE78BAE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcmaster.c"; sourceTree = "SOURCE_ROOT"; }; + A81966C0F4542F7C5DAF5BBF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A8209DFA6D320A6BD9BBDB48 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = analysis.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/analysis.c"; sourceTree = "SOURCE_ROOT"; }; A8315F08B794D9C87328F17F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_plugin_client_VST_utils.mm"; path = "../../JuceLibraryCode/juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; A85FEFF5F978F3B76D9829C1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PropertySet.h"; path = "../../../../modules/juce_core/containers/juce_PropertySet.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2701,7 +2703,8 @@ 5BDF2D3ACDBBCAA8E2BD4803 = {isa = PBXGroup; children = ( D43C762F1355546820373F14, 7B351E0CEB9BE04BE1F04AF5, - 35331E7E5F8892DF428E5E14, ); name = embedding; sourceTree = ""; }; + 35331E7E5F8892DF428E5E14, + 05E748FAB3D311D0B3D8DA84, ); name = embedding; sourceTree = ""; }; 3496C854B0BD70F6304A1724 = {isa = PBXGroup; children = ( F895132C805C3C8187536E4C, 2024F0516E5DB6817D115CE3, @@ -2728,6 +2731,7 @@ 7E838C96F00848B2EE6E2F72, 563DED873ACBEF1E48CDCD13, 0614ED95FE4A34757F366F06, + A81966C0F4542F7C5DAF5BBF, 15D7465655AABF4F6BBA81CF, 0C5C43B5677B8F335F364B14, 98305AA6513DCC298E322C0B, @@ -3119,7 +3123,7 @@ 4D9D92DD454BB03746241196, ); runOnlyForDeploymentPostprocessing = 0; }; CD6892FED0DB19C0DDD9AD37 = {isa = PBXNativeTarget; buildConfigurationList = AF907C78A0D17B741F5F8944; buildPhases = ( 1F4A8812AAE49E02F3215F48, ); buildRules = ( ); dependencies = ( ); name = "AUv3Synth - Shared Code"; productName = AUv3Synth; productReference = 9536B5A780A03F6BACB24144; productType = "com.apple.product-type.library.static"; }; - D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; + D0E003364F0BE3205BD9243E = {isa = PBXProject; buildConfigurationList = 444EA74CE26BF416566E542C; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { EF49DCC88B5FC3C6E67ED2A4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };7A046597FDDDB82B78C64AAC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };D493488C4B5B9D9B5990FEE2 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };CD6892FED0DB19C0DDD9AD37 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4BFA153CE4E8A774C67EC642; projectDirPath = ""; projectRoot = ""; targets = (EF49DCC88B5FC3C6E67ED2A4, 7A046597FDDDB82B78C64AAC, D493488C4B5B9D9B5990FEE2, CD6892FED0DB19C0DDD9AD37); }; }; rootObject = D0E003364F0BE3205BD9243E; } diff --git a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h index 913a8205d1..7ccc209198 100644 --- a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h +++ b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h @@ -212,10 +212,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj index ef1e8b64a6..f0b165c020 100644 --- a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj +++ b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj @@ -38,6 +38,7 @@ 0054E026B84A3A87020CCE48 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarComponent.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0060F61BFBCEF4E9EF8B3CC0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; }; 01A3657086BDD1A8707EF4F4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_opengl.cpp"; path = "../../../../modules/juce_opengl/juce_opengl.cpp"; sourceTree = "SOURCE_ROOT"; }; + 02214E6DD8D660825302535F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 02AC998E808CAF5C148CFFC5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; }; 02C14E49091F42750CD72F00 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Button.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_Button.h"; sourceTree = "SOURCE_ROOT"; }; 02CA378FD3B14EC424052317 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MPEZone.cpp"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEZone.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1157,6 +1158,7 @@ F65A6A3350F6251E8BBF8CF7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MP3AudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; F6BE9CF7A96F7758CE2F8FE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "setup_44p51.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44p51.h"; sourceTree = "SOURCE_ROOT"; }; F6C977C654069F64F4AB869D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MPEValue.cpp"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEValue.cpp"; sourceTree = "SOURCE_ROOT"; }; + F6D368918C89BB1100529598 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; F72711E343DE3475EF3AAB47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "psych_44.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_44.h"; sourceTree = "SOURCE_ROOT"; }; F73B6D934AEC9887D9EBB5E2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; }; F79ADEBA7B305354085FFB8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VST3PluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2464,7 +2466,8 @@ A20C6083A30B3B9D0CA40FD0 = {isa = PBXGroup; children = ( 0E894AC7229948568720E294, C45AB95F4CDF31A41199E6D4, - 414AAB7000E7FDE7683BE72F, ); name = embedding; sourceTree = ""; }; + 414AAB7000E7FDE7683BE72F, + F6D368918C89BB1100529598, ); name = embedding; sourceTree = ""; }; 438005B65094D42C98B878B7 = {isa = PBXGroup; children = ( B401E96340B8AB5DE8CBF5C9, BD588F8D5FD1E6FE88E9D3E4, @@ -2491,6 +2494,7 @@ BA7FDBE53073F3261D962FF9, FF5A9CC255FCF745DC55BBF2, CF3A277ECE6853DDE5FCBEC5, + 02214E6DD8D660825302535F, 1A7002B936C11924FDC07023, 66B37CB373F19F65553466C3, F257AD1B82D5595FF9C3F1CA, @@ -2760,7 +2764,7 @@ 6DD59723DA58F112C3C6F427, 2CCE82C7290D2D226DD34C0B, 4516F5A575174EF76FEAD8B3, ); buildRules = ( ); dependencies = ( ); name = "AnimationAppExample - App"; productName = AnimationAppExample; productReference = CBF69B3CBCD089CD7DC8343C; productType = "com.apple.product-type.application"; }; - AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; + AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; }; rootObject = AEF97977FF56185DB5E0C493; } diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln index db213d2d32..549a9b9dac 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln @@ -1484,6 +1484,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1516,6 +1517,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj index cae38384ae..dee56984c5 100644 --- a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj +++ b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample.xcodeproj/project.pbxproj @@ -39,6 +39,7 @@ 0060F61BFBCEF4E9EF8B3CC0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; }; 012CB8E6966875E4AE099E8C = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 01A3657086BDD1A8707EF4F4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_opengl.cpp"; path = "../../../../modules/juce_opengl/juce_opengl.cpp"; sourceTree = "SOURCE_ROOT"; }; + 02214E6DD8D660825302535F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 02AC998E808CAF5C148CFFC5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; }; 02C14E49091F42750CD72F00 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Button.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_Button.h"; sourceTree = "SOURCE_ROOT"; }; 02CA378FD3B14EC424052317 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MPEZone.cpp"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEZone.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1158,6 +1159,7 @@ F65A6A3350F6251E8BBF8CF7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MP3AudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; F6BE9CF7A96F7758CE2F8FE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "setup_44p51.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44p51.h"; sourceTree = "SOURCE_ROOT"; }; F6C977C654069F64F4AB869D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MPEValue.cpp"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEValue.cpp"; sourceTree = "SOURCE_ROOT"; }; + F6D368918C89BB1100529598 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; F72711E343DE3475EF3AAB47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "psych_44.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_44.h"; sourceTree = "SOURCE_ROOT"; }; F73B6D934AEC9887D9EBB5E2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; }; F79ADEBA7B305354085FFB8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VST3PluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2464,7 +2466,8 @@ A20C6083A30B3B9D0CA40FD0 = {isa = PBXGroup; children = ( 0E894AC7229948568720E294, C45AB95F4CDF31A41199E6D4, - 414AAB7000E7FDE7683BE72F, ); name = embedding; sourceTree = ""; }; + 414AAB7000E7FDE7683BE72F, + F6D368918C89BB1100529598, ); name = embedding; sourceTree = ""; }; 438005B65094D42C98B878B7 = {isa = PBXGroup; children = ( B401E96340B8AB5DE8CBF5C9, BD588F8D5FD1E6FE88E9D3E4, @@ -2491,6 +2494,7 @@ BA7FDBE53073F3261D962FF9, FF5A9CC255FCF745DC55BBF2, CF3A277ECE6853DDE5FCBEC5, + 02214E6DD8D660825302535F, 1A7002B936C11924FDC07023, 66B37CB373F19F65553466C3, F257AD1B82D5595FF9C3F1CA, @@ -2766,7 +2770,7 @@ 6DD59723DA58F112C3C6F427, 2CCE82C7290D2D226DD34C0B, 4516F5A575174EF76FEAD8B3, ); buildRules = ( ); dependencies = ( ); name = "AnimationAppExample - App"; productName = AnimationAppExample; productReference = CBF69B3CBCD089CD7DC8343C; productType = "com.apple.product-type.application"; }; - AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; + AEF97977FF56185DB5E0C493 = {isa = PBXProject; buildConfigurationList = 576D6DACFB71E339D0AD373A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 80F5D4DB72CAE33FF7BE0E28 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = E2839CF91E2C633A933666F4; projectDirPath = ""; projectRoot = ""; targets = (80F5D4DB72CAE33FF7BE0E28); }; }; rootObject = AEF97977FF56185DB5E0C493; } diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index be57625c7c..f6901bac54 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -191,10 +191,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj index 2720fe3692..0edf8a5f98 100644 --- a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj +++ b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj @@ -1051,6 +1051,7 @@ D59DF1631592A9A9955A5278 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = "../../../../modules/juce_core/zip/zlib/crc32.c"; sourceTree = "SOURCE_ROOT"; }; D5C975D1C3B065AC14FB6311 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = float.h; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/float.h"; sourceTree = "SOURCE_ROOT"; }; D5E118687F94A7A960E7EC71 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageEffectFilter.h"; path = "../../../../modules/juce_graphics/effects/juce_ImageEffectFilter.h"; sourceTree = "SOURCE_ROOT"; }; + D5F98F9CE2B0C5DD1286015C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D61678919BFC783EC4062605 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioParameterChoice.h"; path = "../../../../modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h"; sourceTree = "SOURCE_ROOT"; }; D64591D66210D08D4AA5DC05 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcdctmgr.c"; sourceTree = "SOURCE_ROOT"; }; D651F8F1F8E732F91907DA71 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = inffast.h; path = "../../../../modules/juce_core/zip/zlib/inffast.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1159,6 +1160,7 @@ EC41E20B845B695675761614 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_mac_CoreAudio.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp"; sourceTree = "SOURCE_ROOT"; }; EC443EF07555D528F21945DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.h"; sourceTree = "SOURCE_ROOT"; }; EC7A2DEE957A2B375201FC12 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; }; + ECB7E9CFE82E5B3B7E9C6A15 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; ECD6FDB8D99D661E23915E85 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDeviceManager.cpp"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp"; sourceTree = "SOURCE_ROOT"; }; EDAA8D220CC237DE5D612F47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLFrameBuffer.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; EDB90C4006AC89CCFAC4AF82 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BubbleMessageComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2546,7 +2548,8 @@ 8684ED38AFDC57571C780B9B = {isa = PBXGroup; children = ( C5ACDF0DCF5337C0B0AE1AF6, 88AA420D1FEF4EB95D8166FB, - 9A2D9A5DBD78446D8878717A, ); name = embedding; sourceTree = ""; }; + 9A2D9A5DBD78446D8878717A, + ECB7E9CFE82E5B3B7E9C6A15, ); name = embedding; sourceTree = ""; }; 7B3438A59A450DE9E2BE05BF = {isa = PBXGroup; children = ( 2C34C4F10FEED10795237530, CC27C420117D56ABAB4984C6, @@ -2573,6 +2576,7 @@ E9CAA6108E4CC9A8240EDDC1, 02F74E5463D3FCE75E825912, 393536C09877BBED2E2F39D7, + D5F98F9CE2B0C5DD1286015C, 1F9EB82BB8FBECB611B7DBED, FD81229B12072A6A5D27465C, 5248E05CA643E149A0B9A8D4, @@ -2847,7 +2851,7 @@ 3602833D915A2AC7C25F537F, BC3ECD5BCB6580E951083B7E, C9974DDFB456D5307D4C29F3, ); buildRules = ( ); dependencies = ( ); name = "AudioAppExample - App"; productName = AudioAppExample; productReference = 9C71E9533EDADF610F789D88; productType = "com.apple.product-type.application"; }; - 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; + 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; }; rootObject = 0E00FEF4A999DE35888889AE; } diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj b/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj index b9bc069464..a57585f577 100644 --- a/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj +++ b/examples/AudioAppExample/Builds/iOS/AudioAppExample.xcodeproj/project.pbxproj @@ -1053,6 +1053,7 @@ D59DF1631592A9A9955A5278 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = "../../../../modules/juce_core/zip/zlib/crc32.c"; sourceTree = "SOURCE_ROOT"; }; D5C975D1C3B065AC14FB6311 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = float.h; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/float.h"; sourceTree = "SOURCE_ROOT"; }; D5E118687F94A7A960E7EC71 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageEffectFilter.h"; path = "../../../../modules/juce_graphics/effects/juce_ImageEffectFilter.h"; sourceTree = "SOURCE_ROOT"; }; + D5F98F9CE2B0C5DD1286015C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D61678919BFC783EC4062605 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioParameterChoice.h"; path = "../../../../modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h"; sourceTree = "SOURCE_ROOT"; }; D64591D66210D08D4AA5DC05 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcdctmgr.c"; sourceTree = "SOURCE_ROOT"; }; D651F8F1F8E732F91907DA71 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = inffast.h; path = "../../../../modules/juce_core/zip/zlib/inffast.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1159,6 +1160,7 @@ EC41E20B845B695675761614 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_mac_CoreAudio.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp"; sourceTree = "SOURCE_ROOT"; }; EC443EF07555D528F21945DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.h"; sourceTree = "SOURCE_ROOT"; }; EC7A2DEE957A2B375201FC12 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; }; + ECB7E9CFE82E5B3B7E9C6A15 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; ECD6FDB8D99D661E23915E85 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDeviceManager.cpp"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp"; sourceTree = "SOURCE_ROOT"; }; EDAA8D220CC237DE5D612F47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLFrameBuffer.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; EDB90C4006AC89CCFAC4AF82 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BubbleMessageComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2546,7 +2548,8 @@ 8684ED38AFDC57571C780B9B = {isa = PBXGroup; children = ( C5ACDF0DCF5337C0B0AE1AF6, 88AA420D1FEF4EB95D8166FB, - 9A2D9A5DBD78446D8878717A, ); name = embedding; sourceTree = ""; }; + 9A2D9A5DBD78446D8878717A, + ECB7E9CFE82E5B3B7E9C6A15, ); name = embedding; sourceTree = ""; }; 7B3438A59A450DE9E2BE05BF = {isa = PBXGroup; children = ( 2C34C4F10FEED10795237530, CC27C420117D56ABAB4984C6, @@ -2573,6 +2576,7 @@ E9CAA6108E4CC9A8240EDDC1, 02F74E5463D3FCE75E825912, 393536C09877BBED2E2F39D7, + D5F98F9CE2B0C5DD1286015C, 1F9EB82BB8FBECB611B7DBED, FD81229B12072A6A5D27465C, 5248E05CA643E149A0B9A8D4, @@ -2853,7 +2857,7 @@ 3602833D915A2AC7C25F537F, BC3ECD5BCB6580E951083B7E, C9974DDFB456D5307D4C29F3, ); buildRules = ( ); dependencies = ( ); name = "AudioAppExample - App"; productName = AudioAppExample; productReference = 9C71E9533EDADF610F789D88; productType = "com.apple.product-type.application"; }; - 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; + 0E00FEF4A999DE35888889AE = {isa = PBXProject; buildConfigurationList = 074FE87A26471418B3AC0921; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D010D5837C01EB7574A48649 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 41A4B977F5588A439A066455; projectDirPath = ""; projectRoot = ""; targets = (D010D5837C01EB7574A48649); }; }; rootObject = 0E00FEF4A999DE35888889AE; } diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 5b701c7d7b..1f08091c94 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj index db314f1f4f..c8f39371c9 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/MacOSX/BlocksDrawing.xcodeproj/project.pbxproj @@ -746,6 +746,7 @@ 96C12E88FC9FA008BEDD2B33 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RuleBasedTopologySource.cpp"; path = "../../../../../modules/juce_blocks_basics/topology/juce_RuleBasedTopologySource.cpp"; sourceTree = "SOURCE_ROOT"; }; 96CD68D66422237A8B854E2D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "lpc_flac.c"; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c"; sourceTree = "SOURCE_ROOT"; }; 96EC2B19F751907CB45B01BF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Atomic.h"; path = "../../../../../modules/juce_core/memory/juce_Atomic.h"; sourceTree = "SOURCE_ROOT"; }; + 96FFBE03E6540F537A92682D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 972E1506B4B1E6671E3886B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilterAudioSource.h"; path = "../../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h"; sourceTree = "SOURCE_ROOT"; }; 9783CB2BAA068EB04B2DE913 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "codec_internal.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codec_internal.h"; sourceTree = "SOURCE_ROOT"; }; 9793AB1BCA6FC17E9AB9E2E8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_gui_extra.h"; path = "../../../../../modules/juce_gui_extra/juce_gui_extra.h"; sourceTree = "SOURCE_ROOT"; }; @@ -754,6 +755,7 @@ 986010E9A082A0DF23C16F2D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_opengl.cpp"; path = "../../../../../modules/juce_opengl/juce_opengl.cpp"; sourceTree = "SOURCE_ROOT"; }; 9882D3310A95980C9D5DDD23 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FloatVectorOperations.h"; path = "../../../../../modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h"; sourceTree = "SOURCE_ROOT"; }; 98871DB50478294FB98B1250 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Network.cpp"; path = "../../../../../modules/juce_core/native/juce_win32_Network.cpp"; sourceTree = "SOURCE_ROOT"; }; + 989153E7841EDBD30AA0B70E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 98B11261E0FC7EE6D99E7DF3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = format.h; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/format.h"; sourceTree = "SOURCE_ROOT"; }; 98E2AD4DF8685112F956B0CC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LowLevelGraphicsSoftwareRenderer.cpp"; path = "../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"; sourceTree = "SOURCE_ROOT"; }; 993A3BEE971C778CF8155E3A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VSTPluginFormat.cpp"; path = "../../../../../modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2569,7 +2571,8 @@ 4F6FD1275DC7EC86601A5AB6 = {isa = PBXGroup; children = ( FB678E72A050B9C8405A49D3, 192285B9EE21A90ED7F8E0C3, - 1B6526803945EC2E65A2003A, ); name = embedding; sourceTree = ""; }; + 1B6526803945EC2E65A2003A, + 96FFBE03E6540F537A92682D, ); name = embedding; sourceTree = ""; }; 48AF61937B2A3861191A8C99 = {isa = PBXGroup; children = ( 0146ADA6A37B56C2B80B664B, C5350D02D320948DED393876, @@ -2596,6 +2599,7 @@ A0FBE04131F0B428E5382BAD, 88BDF517A77A4EAACF91CCB5, E0773BD6C9241C609EE7A310, + 989153E7841EDBD30AA0B70E, 59ED2CD34E9EE135DEF23CBB, B4B4DC2B15A8661F0AFEF3E6, 23BAF64A603F0EB4AFCDCD5C, @@ -2842,7 +2846,7 @@ B64F4B6419098A6C579D0EDB, 6F1EAB6EC19EDAB88EF14DE0, 704E8CB52C968D24DAE2ABD5, ); buildRules = ( ); dependencies = ( ); name = "BlocksDrawing - App"; productName = BlocksDrawing; productReference = 7A425A86C84D843976582BAF; productType = "com.apple.product-type.application"; }; - 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; + 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; }; rootObject = 46C68557D30B3B44D3FE037B; } diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln index 5aad27670c..5b7c9ae3fb 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln @@ -1569,6 +1569,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1601,6 +1602,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln index f14cccf5da..7ebf79093c 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln @@ -1569,6 +1569,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1601,6 +1602,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj index 0da28b2bc9..b59dd7f772 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing.xcodeproj/project.pbxproj @@ -750,6 +750,7 @@ 96C12E88FC9FA008BEDD2B33 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RuleBasedTopologySource.cpp"; path = "../../../../../modules/juce_blocks_basics/topology/juce_RuleBasedTopologySource.cpp"; sourceTree = "SOURCE_ROOT"; }; 96CD68D66422237A8B854E2D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "lpc_flac.c"; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c"; sourceTree = "SOURCE_ROOT"; }; 96EC2B19F751907CB45B01BF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Atomic.h"; path = "../../../../../modules/juce_core/memory/juce_Atomic.h"; sourceTree = "SOURCE_ROOT"; }; + 96FFBE03E6540F537A92682D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 972E1506B4B1E6671E3886B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilterAudioSource.h"; path = "../../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h"; sourceTree = "SOURCE_ROOT"; }; 9783CB2BAA068EB04B2DE913 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "codec_internal.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codec_internal.h"; sourceTree = "SOURCE_ROOT"; }; 9793AB1BCA6FC17E9AB9E2E8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_gui_extra.h"; path = "../../../../../modules/juce_gui_extra/juce_gui_extra.h"; sourceTree = "SOURCE_ROOT"; }; @@ -758,6 +759,7 @@ 986010E9A082A0DF23C16F2D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_opengl.cpp"; path = "../../../../../modules/juce_opengl/juce_opengl.cpp"; sourceTree = "SOURCE_ROOT"; }; 9882D3310A95980C9D5DDD23 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FloatVectorOperations.h"; path = "../../../../../modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h"; sourceTree = "SOURCE_ROOT"; }; 98871DB50478294FB98B1250 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Network.cpp"; path = "../../../../../modules/juce_core/native/juce_win32_Network.cpp"; sourceTree = "SOURCE_ROOT"; }; + 989153E7841EDBD30AA0B70E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 98B11261E0FC7EE6D99E7DF3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = format.h; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/format.h"; sourceTree = "SOURCE_ROOT"; }; 98E2AD4DF8685112F956B0CC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LowLevelGraphicsSoftwareRenderer.cpp"; path = "../../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"; sourceTree = "SOURCE_ROOT"; }; 993A3BEE971C778CF8155E3A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VSTPluginFormat.cpp"; path = "../../../../../modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2573,7 +2575,8 @@ 4F6FD1275DC7EC86601A5AB6 = {isa = PBXGroup; children = ( FB678E72A050B9C8405A49D3, 192285B9EE21A90ED7F8E0C3, - 1B6526803945EC2E65A2003A, ); name = embedding; sourceTree = ""; }; + 1B6526803945EC2E65A2003A, + 96FFBE03E6540F537A92682D, ); name = embedding; sourceTree = ""; }; 48AF61937B2A3861191A8C99 = {isa = PBXGroup; children = ( 0146ADA6A37B56C2B80B664B, C5350D02D320948DED393876, @@ -2600,6 +2603,7 @@ A0FBE04131F0B428E5382BAD, 88BDF517A77A4EAACF91CCB5, E0773BD6C9241C609EE7A310, + 989153E7841EDBD30AA0B70E, 59ED2CD34E9EE135DEF23CBB, B4B4DC2B15A8661F0AFEF3E6, 23BAF64A603F0EB4AFCDCD5C, @@ -2856,7 +2860,7 @@ B64F4B6419098A6C579D0EDB, 6F1EAB6EC19EDAB88EF14DE0, 704E8CB52C968D24DAE2ABD5, ); buildRules = ( ); dependencies = ( ); name = "BlocksDrawing - App"; productName = BlocksDrawing; productReference = 7A425A86C84D843976582BAF; productType = "com.apple.product-type.application"; }; - 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; + 46C68557D30B3B44D3FE037B = {isa = PBXProject; buildConfigurationList = DD23365E44ACBF007DC85D46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F0C1DAFB0E78213F565F044F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0E79852FE469702C8F99D6F3; projectDirPath = ""; projectRoot = ""; targets = (F0C1DAFB0E78213F565F044F); }; }; rootObject = 46C68557D30B3B44D3FE037B; } diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h index 4641b057c5..ede6f22a82 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h @@ -202,10 +202,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj index 16e382c807..a4e98d1e2e 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/MacOSX/BlocksMonitor.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ 034E4F3996519B2624117798 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PhysicalTopologySource.h"; path = "../../../../../modules/juce_blocks_basics/topology/juce_PhysicalTopologySource.h"; sourceTree = "SOURCE_ROOT"; }; 036AB53DA1FCBDB74F591CC3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SpinLock.h"; path = "../../../../../modules/juce_core/threads/juce_SpinLock.h"; sourceTree = "SOURCE_ROOT"; }; 0377FDB5BDD3EC08C3F83FBD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Application.h"; path = "../../../../../modules/juce_gui_basics/application/juce_Application.h"; sourceTree = "SOURCE_ROOT"; }; + 039443A3C7304F0A0184B970 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 03AF279CB4C8AA1B917C9E6E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; }; 04185482CCC0316BF46B2DC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "window_flac.c"; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/window_flac.c"; sourceTree = "SOURCE_ROOT"; }; 044402CF33BF673FD4FE541E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TimeSliceThread.cpp"; path = "../../../../../modules/juce_core/threads/juce_TimeSliceThread.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -256,6 +257,7 @@ 2D0232CD6B55510B10D2D04D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Block.cpp"; path = "../../../../../modules/juce_blocks_basics/blocks/juce_Block.cpp"; sourceTree = "SOURCE_ROOT"; }; 2D2C6DAA3B50438E63266771 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Point.h"; path = "../../../../../modules/juce_graphics/geometry/juce_Point.h"; sourceTree = "SOURCE_ROOT"; }; 2D40263014314146060C284D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTCommon.h"; path = "../../../../../modules/juce_audio_processors/format_types/juce_VSTCommon.h"; sourceTree = "SOURCE_ROOT"; }; + 2D40B6D3AF346FD1DE802510 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 2D583C31EE6E9A5D8ACD988F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jversion.h; path = "../../../../../modules/juce_graphics/image_formats/jpglib/jversion.h"; sourceTree = "SOURCE_ROOT"; }; 2D6A566127C2A4C4F8087831 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGL_linux_X11.h"; path = "../../../../../modules/juce_opengl/native/juce_OpenGL_linux_X11.h"; sourceTree = "SOURCE_ROOT"; }; 2E3883BEB89636D207BB88B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ArrayAllocationBase.h"; path = "../../../../../modules/juce_core/containers/juce_ArrayAllocationBase.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2569,7 +2571,8 @@ 175807F9D449A924A35D7995 = {isa = PBXGroup; children = ( C438A00F7FAE0D151BC99D0B, D1831592A88B72CE43CB9130, - B6C06A491AB738501ACC77AE, ); name = embedding; sourceTree = ""; }; + B6C06A491AB738501ACC77AE, + 039443A3C7304F0A0184B970, ); name = embedding; sourceTree = ""; }; D77358461927DD290D45860D = {isa = PBXGroup; children = ( C6FFBF028815A3D4D197C1ED, D1C39914B1CDF9FDCF40F03C, @@ -2596,6 +2599,7 @@ 7A5FADFA9A6CF71D5D2B9FC6, 06D7A791BCDE209113651023, 3621EBCE1E661120451A8892, + 2D40B6D3AF346FD1DE802510, C19D89C56696F5747C298985, 816E973AAA295DE63DEBC95D, 4C512E6E088C4B973E866756, @@ -2842,7 +2846,7 @@ D08BB290D5F778E1450AD3F3, 9C2AF708958E95C688544D95, 2410311707C8C7B9E6CFE23D, ); buildRules = ( ); dependencies = ( ); name = "BlocksMonitor - App"; productName = BlocksMonitor; productReference = 00558AF4AA37DD00B15B21A8; productType = "com.apple.product-type.application"; }; - B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; + B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; }; rootObject = B42B7651E1352BD7921E5754; } diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln index 3a8bd44e10..4087ee9bfe 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln @@ -1569,6 +1569,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1601,6 +1602,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln index ea19c8be0e..c463fac675 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln @@ -1569,6 +1569,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1601,6 +1602,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj index 001343b5ec..70427f2e8a 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ 034E4F3996519B2624117798 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PhysicalTopologySource.h"; path = "../../../../../modules/juce_blocks_basics/topology/juce_PhysicalTopologySource.h"; sourceTree = "SOURCE_ROOT"; }; 036AB53DA1FCBDB74F591CC3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SpinLock.h"; path = "../../../../../modules/juce_core/threads/juce_SpinLock.h"; sourceTree = "SOURCE_ROOT"; }; 0377FDB5BDD3EC08C3F83FBD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Application.h"; path = "../../../../../modules/juce_gui_basics/application/juce_Application.h"; sourceTree = "SOURCE_ROOT"; }; + 039443A3C7304F0A0184B970 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 03AF279CB4C8AA1B917C9E6E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; }; 04185482CCC0316BF46B2DC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "window_flac.c"; path = "../../../../../modules/juce_audio_formats/codecs/flac/libFLAC/window_flac.c"; sourceTree = "SOURCE_ROOT"; }; 044402CF33BF673FD4FE541E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TimeSliceThread.cpp"; path = "../../../../../modules/juce_core/threads/juce_TimeSliceThread.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -259,6 +260,7 @@ 2D0232CD6B55510B10D2D04D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Block.cpp"; path = "../../../../../modules/juce_blocks_basics/blocks/juce_Block.cpp"; sourceTree = "SOURCE_ROOT"; }; 2D2C6DAA3B50438E63266771 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Point.h"; path = "../../../../../modules/juce_graphics/geometry/juce_Point.h"; sourceTree = "SOURCE_ROOT"; }; 2D40263014314146060C284D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTCommon.h"; path = "../../../../../modules/juce_audio_processors/format_types/juce_VSTCommon.h"; sourceTree = "SOURCE_ROOT"; }; + 2D40B6D3AF346FD1DE802510 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 2D583C31EE6E9A5D8ACD988F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jversion.h; path = "../../../../../modules/juce_graphics/image_formats/jpglib/jversion.h"; sourceTree = "SOURCE_ROOT"; }; 2D6A566127C2A4C4F8087831 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGL_linux_X11.h"; path = "../../../../../modules/juce_opengl/native/juce_OpenGL_linux_X11.h"; sourceTree = "SOURCE_ROOT"; }; 2E3883BEB89636D207BB88B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ArrayAllocationBase.h"; path = "../../../../../modules/juce_core/containers/juce_ArrayAllocationBase.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2573,7 +2575,8 @@ 175807F9D449A924A35D7995 = {isa = PBXGroup; children = ( C438A00F7FAE0D151BC99D0B, D1831592A88B72CE43CB9130, - B6C06A491AB738501ACC77AE, ); name = embedding; sourceTree = ""; }; + B6C06A491AB738501ACC77AE, + 039443A3C7304F0A0184B970, ); name = embedding; sourceTree = ""; }; D77358461927DD290D45860D = {isa = PBXGroup; children = ( C6FFBF028815A3D4D197C1ED, D1C39914B1CDF9FDCF40F03C, @@ -2600,6 +2603,7 @@ 7A5FADFA9A6CF71D5D2B9FC6, 06D7A791BCDE209113651023, 3621EBCE1E661120451A8892, + 2D40B6D3AF346FD1DE802510, C19D89C56696F5747C298985, 816E973AAA295DE63DEBC95D, 4C512E6E088C4B973E866756, @@ -2856,7 +2860,7 @@ D08BB290D5F778E1450AD3F3, 9C2AF708958E95C688544D95, 2410311707C8C7B9E6CFE23D, ); buildRules = ( ); dependencies = ( ); name = "BlocksMonitor - App"; productName = BlocksMonitor; productReference = 00558AF4AA37DD00B15B21A8; productType = "com.apple.product-type.application"; }; - B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; + B42B7651E1352BD7921E5754 = {isa = PBXProject; buildConfigurationList = 61CDB68D74329CF066EA57D6; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9C6BA11D1261B15A2F52EB60 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5D6DAC6A0A862ED325F1DB34; projectDirPath = ""; projectRoot = ""; targets = (9C6BA11D1261B15A2F52EB60); }; }; rootObject = B42B7651E1352BD7921E5754; } diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h index 4641b057c5..ede6f22a82 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h @@ -202,10 +202,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj index f3c48e6963..d73959071f 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/MacOSX/BlocksSynth.xcodeproj/project.pbxproj @@ -945,6 +945,7 @@ C0794CF65E83FA413249342B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../../../../modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; }; C0927E071B6368B5B9BF27DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LADSPAPluginFormat.cpp"; path = "../../../../../modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; C096E8792E18214FCE25A25C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; }; + C0B245B24040F6606CF84CCA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C11AD5554D1AADA105974F41 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../../../../modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; }; C12E3B26BAD438E71B125623 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileBasedDocument.cpp"; path = "../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"; sourceTree = "SOURCE_ROOT"; }; C1564464E7D3E100E68F78F3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1137,6 +1138,7 @@ E56F858D8C2F9C11CBD6308D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "residue_8.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_8.h"; sourceTree = "SOURCE_ROOT"; }; E5A413D6F34F783C7A708B49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = "../../../../../modules/juce_graphics/image_formats/pnglib/pngwutil.c"; sourceTree = "SOURCE_ROOT"; }; E60F4AAC9AEFE0400EEEF3F0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NormalisableRange.h"; path = "../../../../../modules/juce_core/maths/juce_NormalisableRange.h"; sourceTree = "SOURCE_ROOT"; }; + E6B4F690C3876E819F0A75F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; E6BA394E1D41CCDEC2B0DD9B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedPipe.cpp"; path = "../../../../../modules/juce_core/network/juce_NamedPipe.cpp"; sourceTree = "SOURCE_ROOT"; }; E72062CD9EDFCAFFB63157CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FloatVectorOperations.cpp"; path = "../../../../../modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp"; sourceTree = "SOURCE_ROOT"; }; E7402936E5521555F7B600AC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ZipFile.h"; path = "../../../../../modules/juce_core/zip/juce_ZipFile.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2575,7 +2577,8 @@ BB26434B9CA479BA9218D9CC = {isa = PBXGroup; children = ( 75D9711B81D5DBE678D64734, 39C0350A74FE0DD8E792ABC4, - FFC5E68D2033592D6896B282, ); name = embedding; sourceTree = ""; }; + FFC5E68D2033592D6896B282, + C0B245B24040F6606CF84CCA, ); name = embedding; sourceTree = ""; }; DE3A2AD01175FA05865FCD67 = {isa = PBXGroup; children = ( E1714E22DFB33D06F62468F8, D6B40F5575A4546875FDBFCA, @@ -2602,6 +2605,7 @@ 8319007F2F0B140F09E10D2E, 974B1F18E609FB9DE31640C5, FED2394F7EDB0DDCFB0B611D, + E6B4F690C3876E819F0A75F5, 3942B0BFD06ABC8B8AC0459D, F1A811BDF1FBDB3460847383, 86C5B51CA8FE58BBE6C48E5E, @@ -2848,7 +2852,7 @@ B62995CCD71EBA82C2BC1692, C8A1585A07BDCD77C240ECAA, 1EFBDD8D783B94E754626B32, ); buildRules = ( ); dependencies = ( ); name = "BlocksSynth - App"; productName = BlocksSynth; productReference = D778C2ED7EA9D5EDCFBA1507; productType = "com.apple.product-type.application"; }; - C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; + C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; }; rootObject = C28D173095C609C48901860E; } diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln index e37880386b..37cc9457cc 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln @@ -1575,6 +1575,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1607,6 +1608,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln index 63f68ed12a..70f2691edb 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln @@ -1575,6 +1575,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1607,6 +1608,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj index 5c3923dd36..7d95e057c9 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth.xcodeproj/project.pbxproj @@ -949,6 +949,7 @@ C0794CF65E83FA413249342B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../../../../modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; }; C0927E071B6368B5B9BF27DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LADSPAPluginFormat.cpp"; path = "../../../../../modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; C096E8792E18214FCE25A25C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; }; + C0B245B24040F6606CF84CCA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C11AD5554D1AADA105974F41 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../../../../modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; }; C12E3B26BAD438E71B125623 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileBasedDocument.cpp"; path = "../../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"; sourceTree = "SOURCE_ROOT"; }; C1564464E7D3E100E68F78F3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1142,6 +1143,7 @@ E56F858D8C2F9C11CBD6308D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "residue_8.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_8.h"; sourceTree = "SOURCE_ROOT"; }; E5A413D6F34F783C7A708B49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = "../../../../../modules/juce_graphics/image_formats/pnglib/pngwutil.c"; sourceTree = "SOURCE_ROOT"; }; E60F4AAC9AEFE0400EEEF3F0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NormalisableRange.h"; path = "../../../../../modules/juce_core/maths/juce_NormalisableRange.h"; sourceTree = "SOURCE_ROOT"; }; + E6B4F690C3876E819F0A75F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; E6BA394E1D41CCDEC2B0DD9B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedPipe.cpp"; path = "../../../../../modules/juce_core/network/juce_NamedPipe.cpp"; sourceTree = "SOURCE_ROOT"; }; E72062CD9EDFCAFFB63157CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FloatVectorOperations.cpp"; path = "../../../../../modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp"; sourceTree = "SOURCE_ROOT"; }; E7402936E5521555F7B600AC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ZipFile.h"; path = "../../../../../modules/juce_core/zip/juce_ZipFile.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2579,7 +2581,8 @@ BB26434B9CA479BA9218D9CC = {isa = PBXGroup; children = ( 75D9711B81D5DBE678D64734, 39C0350A74FE0DD8E792ABC4, - FFC5E68D2033592D6896B282, ); name = embedding; sourceTree = ""; }; + FFC5E68D2033592D6896B282, + C0B245B24040F6606CF84CCA, ); name = embedding; sourceTree = ""; }; DE3A2AD01175FA05865FCD67 = {isa = PBXGroup; children = ( E1714E22DFB33D06F62468F8, D6B40F5575A4546875FDBFCA, @@ -2606,6 +2609,7 @@ 8319007F2F0B140F09E10D2E, 974B1F18E609FB9DE31640C5, FED2394F7EDB0DDCFB0B611D, + E6B4F690C3876E819F0A75F5, 3942B0BFD06ABC8B8AC0459D, F1A811BDF1FBDB3460847383, 86C5B51CA8FE58BBE6C48E5E, @@ -2862,7 +2866,7 @@ B62995CCD71EBA82C2BC1692, C8A1585A07BDCD77C240ECAA, 1EFBDD8D783B94E754626B32, ); buildRules = ( ); dependencies = ( ); name = "BlocksSynth - App"; productName = BlocksSynth; productReference = D778C2ED7EA9D5EDCFBA1507; productType = "com.apple.product-type.application"; }; - C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; + C28D173095C609C48901860E = {isa = PBXProject; buildConfigurationList = F2BDE5D743A9870C169E5CC8; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0B9ADB15A71FB90DD6919895 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 0F4E2B72B683E9B48DF13DDB; projectDirPath = ""; projectRoot = ""; targets = (0B9ADB15A71FB90DD6919895); }; }; rootObject = C28D173095C609C48901860E; } diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h index 4641b057c5..ede6f22a82 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h @@ -202,10 +202,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj index 5203dd1a5e..9e80970e1e 100644 --- a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj +++ b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj @@ -939,6 +939,7 @@ C94498FF5B5903F3A4DB8D97 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemClipboard.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_SystemClipboard.h"; sourceTree = "SOURCE_ROOT"; }; C962BA7E9A223869976D34C6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; }; C9BA3B74C398D503AD0E2900 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jinclude.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jinclude.h"; sourceTree = "SOURCE_ROOT"; }; + C9EDA3250D13B446ADC17B82 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; C9F5D58D8C6655A6F91B6065 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; CA25CCD75D694874D212F9F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmarker.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcmarker.c"; sourceTree = "SOURCE_ROOT"; }; CA42BBD779E807667E38E995 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ActiveXComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -999,6 +1000,7 @@ D4858953DB75D993F87CE688 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MP3AudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; D4A1384FB2B7E6697D117E2D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdmarker.c"; sourceTree = "SOURCE_ROOT"; }; D4E2137AEA959DD8BDBA29B1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MemoryBlock.cpp"; path = "../../../../modules/juce_core/memory/juce_MemoryBlock.cpp"; sourceTree = "SOURCE_ROOT"; }; + D4F2A356475BEB83B05B8D75 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; D509A39C2C5F64B544A3FAB3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; }; D5250AE29BBEDF0A0D4F4B66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = alloc.h; path = "../../../../modules/juce_audio_formats/codecs/flac/alloc.h"; sourceTree = "SOURCE_ROOT"; }; D53DFC887558419FA69ACE41 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PathIterator.h"; path = "../../../../modules/juce_graphics/geometry/juce_PathIterator.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2509,7 +2511,8 @@ 8F68C55CC5C62045ED707FC4 = {isa = PBXGroup; children = ( 453C6F5261D4308999B514D5, 27E63BF18D5336ABDB3E1C56, - 3F2CC4EB54FC6095ADE5E186, ); name = embedding; sourceTree = ""; }; + 3F2CC4EB54FC6095ADE5E186, + D4F2A356475BEB83B05B8D75, ); name = embedding; sourceTree = ""; }; C51587C7E76F3E51F921A076 = {isa = PBXGroup; children = ( B281EF1CE55E98B9B9DB151E, 89980D4B4ADA3A5B70968088, @@ -2536,6 +2539,7 @@ 3D064760F8BDD63E8930D527, FF9D10CD123D04DA01CA6109, FAD694286DB4544BD898F8DF, + C9EDA3250D13B446ADC17B82, 2D6DDC236B4AC3F32C2B7E85, 5E66277C43D4B8816A34F895, 780BC6ABFD1E63291238DFBE, @@ -2762,7 +2766,7 @@ 9DB3F429F51E36C0D0BA23BE, 61103B6693CEFBD075D35197, 7F8CC4D24837DC0A20E4755D, ); buildRules = ( ); dependencies = ( ); name = "BouncingBallWavetableDemo - App"; productName = BouncingBallWavetableDemo; productReference = 4AAB1224C8A731A6994D74CE; productType = "com.apple.product-type.application"; }; - 974612E740A911D4EF4009DB = {isa = PBXProject; buildConfigurationList = 188D4D6EAB63E875595F6B81; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 17E038E1F4CB0730CD868712 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3F698ABD99D14CCA53BFAF17; projectDirPath = ""; projectRoot = ""; targets = (17E038E1F4CB0730CD868712); }; + 974612E740A911D4EF4009DB = {isa = PBXProject; buildConfigurationList = 188D4D6EAB63E875595F6B81; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 17E038E1F4CB0730CD868712 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3F698ABD99D14CCA53BFAF17; projectDirPath = ""; projectRoot = ""; targets = (17E038E1F4CB0730CD868712); }; }; rootObject = 974612E740A911D4EF4009DB; } diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln index 9f97d034d4..d39dcc0fd0 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln @@ -1539,6 +1539,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1571,6 +1572,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln index 3ca06df549..918e297b06 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln @@ -1539,6 +1539,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1571,6 +1572,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index 70fe5c78ab..3b662b3120 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -202,10 +202,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj b/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj index 696142b7ee..e46edf0527 100644 --- a/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj +++ b/examples/ComponentTutorialExample/Builds/MacOSX/ComponentTutorialExample.xcodeproj/project.pbxproj @@ -398,6 +398,7 @@ 7649D4157DCCF92903C883EC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_String.cpp"; path = "../../../../modules/juce_core/text/juce_String.cpp"; sourceTree = "SOURCE_ROOT"; }; 767CBBD58A107FCA005D38E8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Value.h"; path = "../../../../modules/juce_data_structures/values/juce_Value.h"; sourceTree = "SOURCE_ROOT"; }; 77003D29EC7BA8C0194A6CC2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; }; + 774AEE793F3CB08E13F14B20 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 77F780A1027086DABE090075 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Expression.h"; path = "../../../../modules/juce_core/maths/juce_Expression.h"; sourceTree = "SOURCE_ROOT"; }; 7805AB0B72F8F0E01363D2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallOutBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_CallOutBox.h"; sourceTree = "SOURCE_ROOT"; }; 78F08B1A3E20C34EE41E3CBB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemnobs.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jmemnobs.c"; sourceTree = "SOURCE_ROOT"; }; @@ -573,6 +574,7 @@ A7220770FDA088EC533BDE74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_gui_extra.h"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.h"; sourceTree = "SOURCE_ROOT"; }; A7E128D5BC1767916C80652C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_events.cpp"; path = "../../../../modules/juce_events/juce_events.cpp"; sourceTree = "SOURCE_ROOT"; }; A7E1DDDC3B554B92985D87C5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableComposite.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp"; sourceTree = "SOURCE_ROOT"; }; + A865F40D468E3256830F5838 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; A8C6E57CF011EB43FDBF3386 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTimer.h"; path = "../../../../modules/juce_events/timers/juce_MultiTimer.h"; sourceTree = "SOURCE_ROOT"; }; A8EBB243F37A295D5F0533E8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TabbedButtonBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_TabbedButtonBar.h"; sourceTree = "SOURCE_ROOT"; }; A8FB3AE1936AE125BCD697E6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Colours.h"; path = "../../../../modules/juce_graphics/colour/juce_Colours.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1667,7 +1669,8 @@ 7EFB988D9B0136F977E60F45 = {isa = PBXGroup; children = ( 55DFA734C7AEB7AD1FA75ACB, F6FB8FC72C99063A9189CDF1, - 06D9A86CD966602EE667D435, ); name = embedding; sourceTree = ""; }; + 06D9A86CD966602EE667D435, + A865F40D468E3256830F5838, ); name = embedding; sourceTree = ""; }; 4137F663128F4E123AE245AC = {isa = PBXGroup; children = ( 696B53B2113C83A6EF2ED417, 8B11018691CF485F1067F278, @@ -1694,6 +1697,7 @@ 181B35AA4E9C24FC3F8802FE, B8D769997D853AAE6FF3E0B5, E7B0F634D832385B0E24349E, + 774AEE793F3CB08E13F14B20, 85FAA35DD263DD133CC67497, 70E4B7F2E6C60D45E3BEBD67, B15BCED79FD05CCDB7C2DE05, @@ -1865,7 +1869,7 @@ 7065518BA4A719BD600955DB, A0BD0396A9AB3F7FCF37AD62, 8F57F6817BE0F4126A95541F, ); buildRules = ( ); dependencies = ( ); name = "ComponentTutorialExample - App"; productName = ComponentTutorialExample; productReference = 48DBB774ADD58780B75FD130; productType = "com.apple.product-type.application"; }; - 3B89677F666BF40854CDE8D3 = {isa = PBXProject; buildConfigurationList = D2C0D08571281A97A8437C77; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { FDDAB81F5F4DA48E7807E65A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D0953BB62CDDA1D6C60E6893; projectDirPath = ""; projectRoot = ""; targets = (FDDAB81F5F4DA48E7807E65A); }; + 3B89677F666BF40854CDE8D3 = {isa = PBXProject; buildConfigurationList = D2C0D08571281A97A8437C77; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { FDDAB81F5F4DA48E7807E65A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D0953BB62CDDA1D6C60E6893; projectDirPath = ""; projectRoot = ""; targets = (FDDAB81F5F4DA48E7807E65A); }; }; rootObject = 3B89677F666BF40854CDE8D3; } diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln index 37e95613a3..a3d93a8397 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln @@ -1006,6 +1006,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1038,6 +1039,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln index 28d546ec89..773509b551 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln @@ -1006,6 +1006,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1038,6 +1039,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h index e1c2934ffe..f96f0141fe 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h @@ -111,10 +111,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index 8a890d72d8..6f47a3ea06 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -1278,6 +1278,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -1302,6 +1303,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -2595,6 +2597,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2619,6 +2622,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java index b3355cf3d4..8d6779e0a5 100644 --- a/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java +++ b/examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java @@ -1164,8 +1164,8 @@ public class JuceDemo extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj index 26bd58dc57..53a04b0bb8 100644 --- a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj @@ -954,6 +954,7 @@ A166FEC488A2EE5290FF0722 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; }; A167A41D05FA3B4AC6CA1E9D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = b2GrowableStack.h; path = "../../../../modules/juce_box2d/box2d/Common/b2GrowableStack.h"; sourceTree = "SOURCE_ROOT"; }; A169179FE554C215416FCD7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Typeface.h"; path = "../../../../modules/juce_graphics/fonts/juce_Typeface.h"; sourceTree = "SOURCE_ROOT"; }; + A17806BCDC55B97D8E2AA339 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A1A8D19C2E587194909B2913 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; }; A1EFF3DBE5F7B0C07AE59D7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NamedPipe.h"; path = "../../../../modules/juce_core/network/juce_NamedPipe.h"; sourceTree = "SOURCE_ROOT"; }; A1F10BB1A2745DC95DDDE0D6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLContext.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLContext.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1434,6 +1435,7 @@ FE4C496CFA9A1E786253B005 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableComposite.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp"; sourceTree = "SOURCE_ROOT"; }; FE613A570CE31071FD22DC06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ModalComponentManager.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.cpp"; sourceTree = "SOURCE_ROOT"; }; FEB688750213D0C64F18AA37 = {isa = PBXFileReference; lastKnownFileType = file.zip; name = icons.zip; path = ../../Resources/icons.zip; sourceTree = "SOURCE_ROOT"; }; + FEBCE4587E5A506E34F2BBC9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; FEE40D6560981264BFB46189 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_audio_formats.cpp"; path = "../../../../modules/juce_audio_formats/juce_audio_formats.cpp"; sourceTree = "SOURCE_ROOT"; }; FF34F4ED0C44B2BA4FBF22AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; }; FFF76FBE6229D1D034294843 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jccoefct.c"; sourceTree = "SOURCE_ROOT"; }; @@ -2914,7 +2916,8 @@ 8A078F21816B96546F8C9F27 = {isa = PBXGroup; children = ( 20A4427A1F9CCC5FC58AA159, 57D6E8A8E8D871EB1DEF6A5F, - 17ADC8ECFA616CF392783757, ); name = embedding; sourceTree = ""; }; + 17ADC8ECFA616CF392783757, + FEBCE4587E5A506E34F2BBC9, ); name = embedding; sourceTree = ""; }; 42D23522D61396640C03114D = {isa = PBXGroup; children = ( 0876934F047839205147DB99, 408C5E78F7DE038844E18D31, @@ -2941,6 +2944,7 @@ D93CE990D75211F4A5EBB4F7, DE4911ACF6DDF2A31511D0F0, DF80BF471CDEF288F1226FAE, + A17806BCDC55B97D8E2AA339, A4A64EF73E28AFFBD826AD60, 8D3B18C8A23499AB88F6B700, 1713D0650DCFA516EBF595DF, @@ -3266,7 +3270,7 @@ 8A0460E8E406AB26F4BA09A8, DB71CE9A0FCC9F1D4DB88011, 8B042CD6831F0E9BD5C0815E, ); buildRules = ( ); dependencies = ( ); name = "JuceDemo - App"; productName = JuceDemo; productReference = 90B1185950EF7670F87EAA3F; productType = "com.apple.product-type.application"; }; - A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; + A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; }; rootObject = A97F75347E57A9C1AF731F1D; } diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln index b4c558816c..4d8e86bf82 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln @@ -1737,6 +1737,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1769,6 +1770,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln index b2ee97721b..1f755015bf 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln @@ -1737,6 +1737,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1769,6 +1770,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln index 5ac306f24f..7739d6b9de 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln @@ -1737,6 +1737,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1769,6 +1770,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj index 2e354a6e0b..802cd28126 100644 --- a/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj @@ -952,6 +952,7 @@ A166FEC488A2EE5290FF0722 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; }; A167A41D05FA3B4AC6CA1E9D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = b2GrowableStack.h; path = "../../../../modules/juce_box2d/box2d/Common/b2GrowableStack.h"; sourceTree = "SOURCE_ROOT"; }; A169179FE554C215416FCD7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Typeface.h"; path = "../../../../modules/juce_graphics/fonts/juce_Typeface.h"; sourceTree = "SOURCE_ROOT"; }; + A17806BCDC55B97D8E2AA339 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A1A8D19C2E587194909B2913 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; }; A1EFF3DBE5F7B0C07AE59D7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NamedPipe.h"; path = "../../../../modules/juce_core/network/juce_NamedPipe.h"; sourceTree = "SOURCE_ROOT"; }; A1F10BB1A2745DC95DDDE0D6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLContext.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLContext.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1434,6 +1435,7 @@ FE4C496CFA9A1E786253B005 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableComposite.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp"; sourceTree = "SOURCE_ROOT"; }; FE613A570CE31071FD22DC06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ModalComponentManager.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.cpp"; sourceTree = "SOURCE_ROOT"; }; FEB688750213D0C64F18AA37 = {isa = PBXFileReference; lastKnownFileType = file.zip; name = icons.zip; path = ../../Resources/icons.zip; sourceTree = "SOURCE_ROOT"; }; + FEBCE4587E5A506E34F2BBC9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; FEE40D6560981264BFB46189 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_audio_formats.cpp"; path = "../../../../modules/juce_audio_formats/juce_audio_formats.cpp"; sourceTree = "SOURCE_ROOT"; }; FF34F4ED0C44B2BA4FBF22AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; }; FFF76FBE6229D1D034294843 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jccoefct.c"; sourceTree = "SOURCE_ROOT"; }; @@ -2914,7 +2916,8 @@ 8A078F21816B96546F8C9F27 = {isa = PBXGroup; children = ( 20A4427A1F9CCC5FC58AA159, 57D6E8A8E8D871EB1DEF6A5F, - 17ADC8ECFA616CF392783757, ); name = embedding; sourceTree = ""; }; + 17ADC8ECFA616CF392783757, + FEBCE4587E5A506E34F2BBC9, ); name = embedding; sourceTree = ""; }; 42D23522D61396640C03114D = {isa = PBXGroup; children = ( 0876934F047839205147DB99, 408C5E78F7DE038844E18D31, @@ -2941,6 +2944,7 @@ D93CE990D75211F4A5EBB4F7, DE4911ACF6DDF2A31511D0F0, DF80BF471CDEF288F1226FAE, + A17806BCDC55B97D8E2AA339, A4A64EF73E28AFFBD826AD60, 8D3B18C8A23499AB88F6B700, 1713D0650DCFA516EBF595DF, @@ -3270,7 +3274,7 @@ 8A0460E8E406AB26F4BA09A8, DB71CE9A0FCC9F1D4DB88011, 8B042CD6831F0E9BD5C0815E, ); buildRules = ( ); dependencies = ( ); name = "JuceDemo - App"; productName = JuceDemo; productReference = 90B1185950EF7670F87EAA3F; productType = "com.apple.product-type.application"; }; - A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; + A97F75347E57A9C1AF731F1D = {isa = PBXProject; buildConfigurationList = E3E8152B5B6326971AA2F802; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 00C030852F071EE5DCA3C532 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 605D88E415A9989447F78548; projectDirPath = ""; projectRoot = ""; targets = (00C030852F071EE5DCA3C532); }; }; rootObject = A97F75347E57A9C1AF731F1D; } diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index f210ca5c58..0f01d0f50d 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -204,10 +204,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj index bbf62d8f8e..5fd030401e 100644 --- a/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -587,6 +587,7 @@ B6AC99C26F679771A2F942B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadLocalValue.h"; path = "../../../../modules/juce_core/threads/juce_ThreadLocalValue.h"; sourceTree = "SOURCE_ROOT"; }; B6C28B2DAE4802FA291E3487 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; }; B6C345F16BFAD37B64A5605A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedArray.h"; path = "../../../../modules/juce_core/containers/juce_ReferenceCountedArray.h"; sourceTree = "SOURCE_ROOT"; }; + B73D30DDD2A8CABBE1EBA6B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; B78154B28539A2E8152D2B9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AsyncUpdater.h"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.h"; sourceTree = "SOURCE_ROOT"; }; B7F363708A0CDC05D9C04876 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Typeface.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"; sourceTree = "SOURCE_ROOT"; }; B86F88CBFF4E577BCCF8D620 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextEditor.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_TextEditor.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -734,6 +735,7 @@ E80A7D62B2B3F4BD2CD3F170 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.cpp"; sourceTree = "SOURCE_ROOT"; }; E830FDCCA2799244C53AEB8F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedLock.h"; sourceTree = "SOURCE_ROOT"; }; E833133B78833DA0D34F48A4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; }; + E83530BF56FBD5548A48B56F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; E8606788391C1A26DBA73D23 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = "../../../../modules/juce_core/zip/zlib/adler32.c"; sourceTree = "SOURCE_ROOT"; }; E862612C6909A6188FBEB8C8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DeletedAtShutdown.cpp"; path = "../../../../modules/juce_events/messages/juce_DeletedAtShutdown.cpp"; sourceTree = "SOURCE_ROOT"; }; E8C858BC5875BA7F76E62B28 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -1663,7 +1665,8 @@ A2648DB3D9CC727490A690CE = {isa = PBXGroup; children = ( 6C632E34FD1B617525987657, 02C0DD7DC29B27B39D5FF154, - DD10783090721EFE21E4FAA5, ); name = embedding; sourceTree = ""; }; + DD10783090721EFE21E4FAA5, + E83530BF56FBD5548A48B56F, ); name = embedding; sourceTree = ""; }; 518915E1B6795C40C04DF4C6 = {isa = PBXGroup; children = ( DCCDA2F20A439FE5044946DE, 5E4F70838E79D6A25B8A80B0, @@ -1690,6 +1693,7 @@ 939EC86DADE3927918AA327C, 3D65648962104F4C641FF3D0, 57F380E4FB341A37BEE30E8B, + B73D30DDD2A8CABBE1EBA6B0, FB845B6C46248D66EB02A862, 140B14E0142DF835F1C6D951, 5136E02D20343ED8DCD90A20, @@ -1861,7 +1865,7 @@ 026F69AE2DD97CA7C9006986, C39352E04613E968B30D0584, CD0E71EFDCF3177FCE405E9D, ); buildRules = ( ); dependencies = ( ); name = "HelloWorld - App"; productName = HelloWorld; productReference = 630E0739D24A3C9E99CD4592; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; + E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln index 1ab043d4a6..c422d0a70d 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln @@ -1004,6 +1004,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1036,6 +1037,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln index dd5d1ca1d7..a42fd8fd70 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln @@ -1004,6 +1004,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1036,6 +1037,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj index 45ee4c0542..3344d1f79a 100644 --- a/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj +++ b/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj @@ -588,6 +588,7 @@ B6C28B2DAE4802FA291E3487 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; }; B6C345F16BFAD37B64A5605A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedArray.h"; path = "../../../../modules/juce_core/containers/juce_ReferenceCountedArray.h"; sourceTree = "SOURCE_ROOT"; }; B700739654886DC8E7C1293B = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = HelloWorld/Images.xcassets; sourceTree = "SOURCE_ROOT"; }; + B73D30DDD2A8CABBE1EBA6B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; B78154B28539A2E8152D2B9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AsyncUpdater.h"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.h"; sourceTree = "SOURCE_ROOT"; }; B7F363708A0CDC05D9C04876 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Typeface.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"; sourceTree = "SOURCE_ROOT"; }; B86F88CBFF4E577BCCF8D620 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextEditor.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_TextEditor.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -734,6 +735,7 @@ E80A7D62B2B3F4BD2CD3F170 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.cpp"; sourceTree = "SOURCE_ROOT"; }; E830FDCCA2799244C53AEB8F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedLock.h"; sourceTree = "SOURCE_ROOT"; }; E833133B78833DA0D34F48A4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; }; + E83530BF56FBD5548A48B56F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; E8606788391C1A26DBA73D23 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = "../../../../modules/juce_core/zip/zlib/adler32.c"; sourceTree = "SOURCE_ROOT"; }; E862612C6909A6188FBEB8C8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DeletedAtShutdown.cpp"; path = "../../../../modules/juce_events/messages/juce_DeletedAtShutdown.cpp"; sourceTree = "SOURCE_ROOT"; }; E8C858BC5875BA7F76E62B28 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -1665,7 +1667,8 @@ A2648DB3D9CC727490A690CE = {isa = PBXGroup; children = ( 6C632E34FD1B617525987657, 02C0DD7DC29B27B39D5FF154, - DD10783090721EFE21E4FAA5, ); name = embedding; sourceTree = ""; }; + DD10783090721EFE21E4FAA5, + E83530BF56FBD5548A48B56F, ); name = embedding; sourceTree = ""; }; 518915E1B6795C40C04DF4C6 = {isa = PBXGroup; children = ( DCCDA2F20A439FE5044946DE, 5E4F70838E79D6A25B8A80B0, @@ -1692,6 +1695,7 @@ 939EC86DADE3927918AA327C, 3D65648962104F4C641FF3D0, 57F380E4FB341A37BEE30E8B, + B73D30DDD2A8CABBE1EBA6B0, FB845B6C46248D66EB02A862, 140B14E0142DF835F1C6D951, 5136E02D20343ED8DCD90A20, @@ -1871,7 +1875,7 @@ 026F69AE2DD97CA7C9006986, C39352E04613E968B30D0584, CD0E71EFDCF3177FCE405E9D, ); buildRules = ( ); dependencies = ( ); name = "HelloWorld - App"; productName = HelloWorld; productReference = 630E0739D24A3C9E99CD4592; productType = "com.apple.product-type.application"; }; - E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; + E34D5B980741D93050D0BB6B = {isa = PBXProject; buildConfigurationList = D5495970AC0AFC78DD0ADE12; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 192D34128EA37F28BC1CBB22 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = CB9C4DF3F11D65C6BF6B80AD; projectDirPath = ""; projectRoot = ""; targets = (192D34128EA37F28BC1CBB22); }; }; rootObject = E34D5B980741D93050D0BB6B; } diff --git a/examples/HelloWorld/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h index e1c2934ffe..f96f0141fe 100644 --- a/examples/HelloWorld/JuceLibraryCode/AppConfig.h +++ b/examples/HelloWorld/JuceLibraryCode/AppConfig.h @@ -111,10 +111,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj index ffd0fea3ce..b97cda07f2 100644 --- a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj +++ b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj @@ -93,6 +93,7 @@ 0A9A5830F103CB7098180498 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jinclude.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jinclude.h"; sourceTree = "SOURCE_ROOT"; }; 0AA95A03D00FE353A2E5AFE7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdinput.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdinput.c"; sourceTree = "SOURCE_ROOT"; }; 0AB0EB7DB8293C2AB03F001B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiMessageCollector.h"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h"; sourceTree = "SOURCE_ROOT"; }; + 0B1024AA4BB116F679B21662 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0B110D22BC05660B4F982D5F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = pnginfo.h; path = "../../../../modules/juce_graphics/image_formats/pnglib/pnginfo.h"; sourceTree = "SOURCE_ROOT"; }; 0B4BE6C38E70E7391A88B4CF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ZipFile.h"; path = "../../../../modules/juce_core/zip/juce_ZipFile.h"; sourceTree = "SOURCE_ROOT"; }; 0B544DB0EBE315150B7DB69E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableText.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.h"; sourceTree = "SOURCE_ROOT"; }; @@ -918,6 +919,7 @@ B8D421A53CACF8D5C22E7DC2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = zlib.h; path = "../../../../modules/juce_core/zip/zlib/zlib.h"; sourceTree = "SOURCE_ROOT"; }; B8E4371A1812FB6544696147 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemClipboard.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_SystemClipboard.h"; sourceTree = "SOURCE_ROOT"; }; B8F33A418BB2AEEA980B25FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedPointer.h"; path = "../../../../modules/juce_core/memory/juce_ScopedPointer.h"; sourceTree = "SOURCE_ROOT"; }; + B942FDE100BEBB205DE90F22 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; B97AF825D9F4F24DF5751FB1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentMovementWatcher.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h"; sourceTree = "SOURCE_ROOT"; }; B9E95B83D03AC32741104229 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = float.h; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/float.h"; sourceTree = "SOURCE_ROOT"; }; BA24E4AEE7BD1C7CDF793728 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageConvolutionKernel.h"; path = "../../../../modules/juce_graphics/images/juce_ImageConvolutionKernel.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2555,7 +2557,8 @@ E1D7895567215D7833E811AF = {isa = PBXGroup; children = ( 9123CC1339B2671E33A3BF0C, 07304207015792AD04B49951, - 47F996A2BA101821A84B1294, ); name = embedding; sourceTree = ""; }; + 47F996A2BA101821A84B1294, + 0B1024AA4BB116F679B21662, ); name = embedding; sourceTree = ""; }; 2B5D494A484A9E30209CE505 = {isa = PBXGroup; children = ( 405855C9B41EB9CAC7DDDD17, 77DA69E8D9174B38C4F330EF, @@ -2582,6 +2585,7 @@ C63E20DAEDFA5299CE44D5B4, 467466BE598D56FCA44AC830, 02AEC604E98F390515462DE1, + B942FDE100BEBB205DE90F22, 9D50273101DC464219A633AC, F242D93EC6CECD96C182FFEC, ECDBA884241B6AAA334E0D23, @@ -2855,7 +2859,7 @@ 518008B4BCAC2EDE2921458A, EF758DF42F97B8D22FD35F80, AF94D754542EEF998EE0EF72, ); buildRules = ( ); dependencies = ( ); name = "MPETest - App"; productName = MPETest; productReference = BCC50B48B1A4B967949B2DB2; productType = "com.apple.product-type.application"; }; - 9606743A47FFF871B775B1AB = {isa = PBXProject; buildConfigurationList = CC7502C8943D2FC599DFC557; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 0DF05A38ED8E8BF6EB7D9C5C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9F958921F12E7C784E909D34; projectDirPath = ""; projectRoot = ""; targets = (0DF05A38ED8E8BF6EB7D9C5C); }; + 9606743A47FFF871B775B1AB = {isa = PBXProject; buildConfigurationList = CC7502C8943D2FC599DFC557; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0DF05A38ED8E8BF6EB7D9C5C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9F958921F12E7C784E909D34; projectDirPath = ""; projectRoot = ""; targets = (0DF05A38ED8E8BF6EB7D9C5C); }; }; rootObject = 9606743A47FFF871B775B1AB; } diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln index 003213bf98..6d8d8dd23b 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln @@ -1544,6 +1544,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1576,6 +1577,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln index 5cbacf4b6f..0a3da6fb46 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln @@ -1544,6 +1544,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1576,6 +1577,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 5b701c7d7b..1f08091c94 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index 4226fa7f04..54fdc914e1 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -1113,6 +1113,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -1137,6 +1138,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -2251,6 +2253,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2275,6 +2278,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java index 72b7c9604a..4306273468 100644 --- a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java +++ b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java @@ -1965,8 +1965,8 @@ public class MidiTest extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj b/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj index 21e4373b15..b8b8e0d679 100644 --- a/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj +++ b/examples/MidiTest/Builds/MacOSX/MidiTest.xcodeproj/project.pbxproj @@ -312,6 +312,7 @@ 3BABE0CFE82FC1E24EF88B87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; }; 3BBF7A3FFBA017A997B1F06F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../../../modules/juce_core/juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 3C9794FEFFD6B2B3CB8F2B65 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WebBrowserComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"; sourceTree = "SOURCE_ROOT"; }; + 3CADE077CFDB0EA18F305EE1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 3CB555A60209891A50F5B070 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = transupp.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/transupp.h"; sourceTree = "SOURCE_ROOT"; }; 3CC6203E67A850DF1B5A055F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = window.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.c"; sourceTree = "SOURCE_ROOT"; }; 3CD7992BECDBC3ABC6BF20EC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -802,6 +803,7 @@ A88B5A8101BD7EAB2B0BAB35 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; }; A8B4A6DDE41B6826A72E1CC1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TableListBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TableListBox.h"; sourceTree = "SOURCE_ROOT"; }; A96E3DEAF00EC750459EE0BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_ImageButton.cpp"; sourceTree = "SOURCE_ROOT"; }; + A976906191B19D0102429019 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; A9BE2C311F9645A85098DC0D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = "../../../../modules/juce_core/zip/zlib/zutil.c"; sourceTree = "SOURCE_ROOT"; }; A9C00D8F92DFA295261DB56B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; }; AA0DA3202B8D324B99972B01 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MPEMessages.h"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEMessages.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2455,7 +2457,8 @@ BD6EE3D913CCD4CD7CB13747 = {isa = PBXGroup; children = ( 6EDA91C4144284C146EE3DA2, 0AAE51BE8E94296CA6BB89CA, - 0671CDC6377ED9857C888231, ); name = embedding; sourceTree = ""; }; + 0671CDC6377ED9857C888231, + A976906191B19D0102429019, ); name = embedding; sourceTree = ""; }; 20FD96A2C15F43AA1CD10CB8 = {isa = PBXGroup; children = ( F0E612E65C1E568B58E7D805, A382A4098E0ED5A32CE5D0A9, @@ -2482,6 +2485,7 @@ 6DECD794AF3A19681E99CBAD, B9A5780355C2AE983F9F9105, FD126F4D7AA7B4B55FD492A2, + 3CADE077CFDB0EA18F305EE1, 3F2956100AC77970E9D6D8F3, 97067DD5073A37AD706DDE95, A01EB1FCF6F4D00B58A8D111, @@ -2680,7 +2684,7 @@ A1114FDF6F871F83BAF3B6B8, 80C515E0387A6AF48C93D08C, AADBC72B2C7030FAD1D8CAF8, ); buildRules = ( ); dependencies = ( ); name = "MidiTest - App"; productName = MidiTest; productReference = AB7855931CA983F4EE039617; productType = "com.apple.product-type.application"; }; - 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; + 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; }; rootObject = 08CC3758D6C29BD07C86A240; } diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln index aa5d13a88e..ac9365070a 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln @@ -1512,6 +1512,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1544,6 +1545,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln index 4b5b503817..f2d3cd73c1 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln @@ -1512,6 +1512,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1544,6 +1545,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj b/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj index 9423f326d4..bccfd54cdc 100644 --- a/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj +++ b/examples/MidiTest/Builds/iOS/MidiTest.xcodeproj/project.pbxproj @@ -311,6 +311,7 @@ 3BABE0CFE82FC1E24EF88B87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; }; 3BBF7A3FFBA017A997B1F06F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../../../modules/juce_core/juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 3C9794FEFFD6B2B3CB8F2B65 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WebBrowserComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"; sourceTree = "SOURCE_ROOT"; }; + 3CADE077CFDB0EA18F305EE1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 3CB555A60209891A50F5B070 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = transupp.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/transupp.h"; sourceTree = "SOURCE_ROOT"; }; 3CC6203E67A850DF1B5A055F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = window.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.c"; sourceTree = "SOURCE_ROOT"; }; 3CD7992BECDBC3ABC6BF20EC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -802,6 +803,7 @@ A88B5A8101BD7EAB2B0BAB35 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; }; A8B4A6DDE41B6826A72E1CC1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TableListBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TableListBox.h"; sourceTree = "SOURCE_ROOT"; }; A96E3DEAF00EC750459EE0BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_ImageButton.cpp"; sourceTree = "SOURCE_ROOT"; }; + A976906191B19D0102429019 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; A9BE2C311F9645A85098DC0D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = "../../../../modules/juce_core/zip/zlib/zutil.c"; sourceTree = "SOURCE_ROOT"; }; A9C00D8F92DFA295261DB56B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; }; AA0DA3202B8D324B99972B01 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MPEMessages.h"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPEMessages.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2459,7 +2461,8 @@ BD6EE3D913CCD4CD7CB13747 = {isa = PBXGroup; children = ( 6EDA91C4144284C146EE3DA2, 0AAE51BE8E94296CA6BB89CA, - 0671CDC6377ED9857C888231, ); name = embedding; sourceTree = ""; }; + 0671CDC6377ED9857C888231, + A976906191B19D0102429019, ); name = embedding; sourceTree = ""; }; 20FD96A2C15F43AA1CD10CB8 = {isa = PBXGroup; children = ( F0E612E65C1E568B58E7D805, A382A4098E0ED5A32CE5D0A9, @@ -2486,6 +2489,7 @@ 6DECD794AF3A19681E99CBAD, B9A5780355C2AE983F9F9105, FD126F4D7AA7B4B55FD492A2, + 3CADE077CFDB0EA18F305EE1, 3F2956100AC77970E9D6D8F3, 97067DD5073A37AD706DDE95, A01EB1FCF6F4D00B58A8D111, @@ -2692,7 +2696,7 @@ A1114FDF6F871F83BAF3B6B8, 80C515E0387A6AF48C93D08C, AADBC72B2C7030FAD1D8CAF8, ); buildRules = ( ); dependencies = ( ); name = "MidiTest - App"; productName = MidiTest; productReference = AB7855931CA983F4EE039617; productType = "com.apple.product-type.application"; }; - 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; + 08CC3758D6C29BD07C86A240 = {isa = PBXProject; buildConfigurationList = 33B4E927BEBC8696D1D2812E; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 68C4BE0E455A27D9A0CEB672 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 937739BC97C6E6294CDCF171; projectDirPath = ""; projectRoot = ""; targets = (68C4BE0E455A27D9A0CEB672); }; }; rootObject = 08CC3758D6C29BD07C86A240; } diff --git a/examples/MidiTest/JuceLibraryCode/AppConfig.h b/examples/MidiTest/JuceLibraryCode/AppConfig.h index 29bce453c7..94e501e537 100644 --- a/examples/MidiTest/JuceLibraryCode/AppConfig.h +++ b/examples/MidiTest/JuceLibraryCode/AppConfig.h @@ -200,10 +200,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index eb0186f6a5..8156be3088 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -1132,6 +1132,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -1156,6 +1157,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -2348,6 +2350,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2372,6 +2375,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java index 9d84584882..37be15d5c5 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java @@ -1164,8 +1164,8 @@ public class JUCENetworkGraphicsDemo extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj b/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj index c3fed246bc..5b7a6a7784 100644 --- a/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj +++ b/examples/NetworkGraphicsDemo/Builds/MacOSX/JUCE Network Graphics Demo.xcodeproj/project.pbxproj @@ -67,6 +67,7 @@ 047CB008052CCD126633FB9B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; }; 04F797332FEC7F3DEAE457B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLPixelFormat.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLPixelFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; 051B1F5CA25863E123C662B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; }; + 052946C0E2B212F3AD668D65 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0543BDC4AF5B2ABF41749383 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OSCBundle.h"; path = "../../../../modules/juce_osc/osc/juce_OSCBundle.h"; sourceTree = "SOURCE_ROOT"; }; 0555BAE6156EAF15CA77A2D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; 0566C8771A3278C82D183A98 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDeviceManager.h"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h"; sourceTree = "SOURCE_ROOT"; }; @@ -700,6 +701,7 @@ 8D7919836FD116E4D151376A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_audio_devices.cpp"; path = "../../../../modules/juce_audio_devices/juce_audio_devices.cpp"; sourceTree = "SOURCE_ROOT"; }; 8DFA74E13F6E40A5B1C09C11 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationProperties.h"; path = "../../../../modules/juce_data_structures/app_properties/juce_ApplicationProperties.h"; sourceTree = "SOURCE_ROOT"; }; 8E019E137C8999437C8C7B8B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lookup.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.h"; sourceTree = "SOURCE_ROOT"; }; + 8E2B628A83369822D1E46D53 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 8E2F72AFA0CDA64F0C07F105 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SlaveComponent.h; path = ../../Source/SlaveComponent.h; sourceTree = "SOURCE_ROOT"; }; 8E32705B99BB15E3586C067C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryIterator.h"; path = "../../../../modules/juce_core/files/juce_DirectoryIterator.h"; sourceTree = "SOURCE_ROOT"; }; 8EE86B89C69AD4D9A802526D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2560,7 +2562,8 @@ 72C12E60BB036DC22E27460B = {isa = PBXGroup; children = ( 66EA0A2E6DCB92EB7CE24516, A34D1DA226DFFEACE090BD72, - F199EA5517B054547E193F08, ); name = embedding; sourceTree = ""; }; + F199EA5517B054547E193F08, + 052946C0E2B212F3AD668D65, ); name = embedding; sourceTree = ""; }; B59A0F94465808EC22F3905F = {isa = PBXGroup; children = ( 58B5DEFABBF903630496C479, 6110B87158ED828E5F9C8FA4, @@ -2587,6 +2590,7 @@ 49EEE3FAA41505E20A1587BB, F649B3F75F5ECFF21898C23D, 1AECB0E05E68BA92645E1D27, + 8E2B628A83369822D1E46D53, DE508CE9EE6F6AFC689CDA33, 6F4CD56079CABCB8F4FBA0D2, 60E6823DF3335C4F4A2B4A09, @@ -2863,7 +2867,7 @@ 714944DB86A4D402E7FA269E, C2977559BF9148DB70CA10AE, 865E89B94B41EB14C202CBB0, ); buildRules = ( ); dependencies = ( ); name = "JUCE Network Graphics Demo - App"; productName = "JUCE Network Graphics Demo"; productReference = E4162459ED4C829EF7B19691; productType = "com.apple.product-type.application"; }; - A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; + A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; }; rootObject = A5398ADB6F5B128C00EB935C; } diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln index 68c3c21fe6..18ec799536 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln @@ -1545,6 +1545,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1577,6 +1578,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln index 71e8a6b409..6a0c542496 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln @@ -1545,6 +1545,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1577,6 +1578,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj index 7e15eb5b47..ba31d083d8 100644 --- a/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj +++ b/examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo.xcodeproj/project.pbxproj @@ -69,6 +69,7 @@ 047CB008052CCD126633FB9B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; }; 04F797332FEC7F3DEAE457B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLPixelFormat.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLPixelFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; 051B1F5CA25863E123C662B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; }; + 052946C0E2B212F3AD668D65 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 0543BDC4AF5B2ABF41749383 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OSCBundle.h"; path = "../../../../modules/juce_osc/osc/juce_OSCBundle.h"; sourceTree = "SOURCE_ROOT"; }; 0555BAE6156EAF15CA77A2D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; 0566C8771A3278C82D183A98 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDeviceManager.h"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h"; sourceTree = "SOURCE_ROOT"; }; @@ -703,6 +704,7 @@ 8D7919836FD116E4D151376A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_audio_devices.cpp"; path = "../../../../modules/juce_audio_devices/juce_audio_devices.cpp"; sourceTree = "SOURCE_ROOT"; }; 8DFA74E13F6E40A5B1C09C11 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationProperties.h"; path = "../../../../modules/juce_data_structures/app_properties/juce_ApplicationProperties.h"; sourceTree = "SOURCE_ROOT"; }; 8E019E137C8999437C8C7B8B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lookup.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.h"; sourceTree = "SOURCE_ROOT"; }; + 8E2B628A83369822D1E46D53 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 8E2F72AFA0CDA64F0C07F105 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SlaveComponent.h; path = ../../Source/SlaveComponent.h; sourceTree = "SOURCE_ROOT"; }; 8E32705B99BB15E3586C067C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryIterator.h"; path = "../../../../modules/juce_core/files/juce_DirectoryIterator.h"; sourceTree = "SOURCE_ROOT"; }; 8EE86B89C69AD4D9A802526D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2564,7 +2566,8 @@ 72C12E60BB036DC22E27460B = {isa = PBXGroup; children = ( 66EA0A2E6DCB92EB7CE24516, A34D1DA226DFFEACE090BD72, - F199EA5517B054547E193F08, ); name = embedding; sourceTree = ""; }; + F199EA5517B054547E193F08, + 052946C0E2B212F3AD668D65, ); name = embedding; sourceTree = ""; }; B59A0F94465808EC22F3905F = {isa = PBXGroup; children = ( 58B5DEFABBF903630496C479, 6110B87158ED828E5F9C8FA4, @@ -2591,6 +2594,7 @@ 49EEE3FAA41505E20A1587BB, F649B3F75F5ECFF21898C23D, 1AECB0E05E68BA92645E1D27, + 8E2B628A83369822D1E46D53, DE508CE9EE6F6AFC689CDA33, 6F4CD56079CABCB8F4FBA0D2, 60E6823DF3335C4F4A2B4A09, @@ -2877,7 +2881,7 @@ 714944DB86A4D402E7FA269E, C2977559BF9148DB70CA10AE, 865E89B94B41EB14C202CBB0, ); buildRules = ( ); dependencies = ( ); name = "JUCE Network Graphics Demo - App"; productName = "JUCE Network Graphics Demo"; productReference = E4162459ED4C829EF7B19691; productType = "com.apple.product-type.application"; }; - A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; + A5398ADB6F5B128C00EB935C = {isa = PBXProject; buildConfigurationList = 02715337C584F3C721251428; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 4311FBCBD02948A0ED96C7DD = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = D2EB65517396C974F0415A7F; projectDirPath = ""; projectRoot = ""; targets = (4311FBCBD02948A0ED96C7DD); }; }; rootObject = A5398ADB6F5B128C00EB935C; } diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 126e2fda86..f6c267fbff 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj index 8c2ec01492..1eb43a4aaa 100644 --- a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj +++ b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj @@ -951,6 +951,7 @@ C42EBB793E610DC9666D218C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OSCTypes.cpp"; path = "../../../../modules/juce_osc/osc/juce_OSCTypes.cpp"; sourceTree = "SOURCE_ROOT"; }; C431C4B65FFD4CE6140020E6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; }; C4A48003D715E59DBBF845B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_video.h"; path = "../../../../modules/juce_video/juce_video.h"; sourceTree = "SOURCE_ROOT"; }; + C4A6E0DC92858921524DF6A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C5FF82EBEA8C36CAFDA36276 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLPixelFormat.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h"; sourceTree = "SOURCE_ROOT"; }; C61175EC56A3396F7A655A1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; }; C624611F6A868DF1A16DEED0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLTexture.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLTexture.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1020,6 +1021,7 @@ D54873C8E2887BB1D4DDE0F6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MP3AudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; D5A6844CB4FE911E71CEC6EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmainct.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcmainct.c"; sourceTree = "SOURCE_ROOT"; }; D6337E387A9C8DA80B7F9BEC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TabbedButtonBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_TabbedButtonBar.h"; sourceTree = "SOURCE_ROOT"; }; + D6B6A8A45737BA45421BBD69 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D6BC20082FD7712E3C8F84F8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_posix_NamedPipe.cpp"; path = "../../../../modules/juce_core/native/juce_posix_NamedPipe.cpp"; sourceTree = "SOURCE_ROOT"; }; D72E8531FE37273574FE95EA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "floor_books.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/floor/floor_books.h"; sourceTree = "SOURCE_ROOT"; }; D76F7038A4C53439F7D5A9C0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RectanglePlacement.h"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2485,7 +2487,8 @@ C43261BE5783D3E612390373 = {isa = PBXGroup; children = ( C6C15C3582C0AD078804ACB9, 6E5DECD2B9E5106FF6842D08, - 1DC0F3CBE38BFEB47BE3E5EF, ); name = embedding; sourceTree = ""; }; + 1DC0F3CBE38BFEB47BE3E5EF, + C4A6E0DC92858921524DF6A0, ); name = embedding; sourceTree = ""; }; 8352D97F756A51F0F21208DB = {isa = PBXGroup; children = ( 001CDEAF55B56911FAD8318B, ED0BDABE9414F6DD57F802D8, @@ -2512,6 +2515,7 @@ F3395E2EECDF18160E8AD7AA, 8C5471A4970F5BFEF7772889, 9C7AD9069E4A83365630A782, + D6B6A8A45737BA45421BBD69, AEAA1C7503CC0B79128A26A4, F1278DE3527B766223893149, EE59138563FAA3589C79DD12, @@ -2805,7 +2809,7 @@ 5EAEC7382D18903A6CC34743, F3B61DF6E57FDFD6B2F506F2, F246BDBFC565CFD500CC8D8B, ); buildRules = ( ); dependencies = ( ); name = "OSCMonitor - App"; productName = OSCMonitor; productReference = 1997CE41947A0FA3AE6FD84C; productType = "com.apple.product-type.application"; }; - 6AEE7D5FA068DDF4AE3BC412 = {isa = PBXProject; buildConfigurationList = 167C45A180F421917A997478; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { CE4CE10FF3A0FD3AA7FF7605 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 6A9D07656A985D7935C7FE29; projectDirPath = ""; projectRoot = ""; targets = (CE4CE10FF3A0FD3AA7FF7605); }; + 6AEE7D5FA068DDF4AE3BC412 = {isa = PBXProject; buildConfigurationList = 167C45A180F421917A997478; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { CE4CE10FF3A0FD3AA7FF7605 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 6A9D07656A985D7935C7FE29; projectDirPath = ""; projectRoot = ""; targets = (CE4CE10FF3A0FD3AA7FF7605); }; }; rootObject = 6AEE7D5FA068DDF4AE3BC412; } diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln index 33f9c4bc98..102b4ad11b 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln @@ -1485,6 +1485,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1517,6 +1518,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln index 1d4acdc3d9..cef1b48f4b 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln @@ -1485,6 +1485,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1517,6 +1518,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index 0543dcbb35..3ccaa895e9 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -192,10 +192,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index 761815ffef..e01dba5ea2 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -778,6 +778,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -802,6 +803,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -1598,6 +1600,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1622,6 +1625,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java index 75f29a52c4..6dcf032a8e 100644 --- a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java +++ b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java @@ -1164,8 +1164,8 @@ public class OSCReceiver extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj b/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj index 1d9620e26e..596704007c 100644 --- a/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj +++ b/examples/OSCReceiver/Builds/MacOSX/OSCReceiver.xcodeproj/project.pbxproj @@ -635,6 +635,7 @@ C071DED5E9CC19690E9FC598 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; }; C0B4E07EA4915B01617B0A9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; }; C1304780621DE055F575181F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PNGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_PNGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; + C1B9B9083812B8F9C7BA0231 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C1F24281F4140662C233E39B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TabbedButtonBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_TabbedButtonBar.h"; sourceTree = "SOURCE_ROOT"; }; C28118368FF1AD6BC7510AC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropContainer.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h"; sourceTree = "SOURCE_ROOT"; }; C2A45982E05ECE2A0F3C40E7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_X11_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -797,6 +798,7 @@ F23C5769A7FC4B9DB4DF5C2C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; }; F25C3FD19868F480AE07C8B1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Random.h"; path = "../../../../modules/juce_core/maths/juce_Random.h"; sourceTree = "SOURCE_ROOT"; }; F26E02D6360ECA56393F94F0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AffineTransform.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"; sourceTree = "SOURCE_ROOT"; }; + F279DB07DEFE502A1343DAE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; F291A8E4DBD8D2BC7FB33290 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsList.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp"; sourceTree = "SOURCE_ROOT"; }; F2A22BCDF323121A2B138E66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; }; F2EAD1FE87BE27F14FF5BD56 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FillType.cpp"; path = "../../../../modules/juce_graphics/colour/juce_FillType.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1718,7 +1720,8 @@ 358EED724ABC645D714E4015 = {isa = PBXGroup; children = ( 507DCF40818D5D16D19A5328, ABBB192D4B75A5C26EFB1664, - 42E1D32A388CEF815E7C9A31, ); name = embedding; sourceTree = ""; }; + 42E1D32A388CEF815E7C9A31, + C1B9B9083812B8F9C7BA0231, ); name = embedding; sourceTree = ""; }; 57FD9ADFE7987A86CD925761 = {isa = PBXGroup; children = ( BEEF29E02364652DC0B3E5F0, A9075C2C2085DB0064BE4B38, @@ -1745,6 +1748,7 @@ FA0684965B9183AB6F7B9917, 857559CF8B878D79B5938CCC, 1BC2675D425BC6F6E5950EB5, + F279DB07DEFE502A1343DAE3, 7DAFB1EF06E70BF521A9D54B, A76D99FB25C1EC8A8ABBB438, 505A9B54AA3630ED7DD6D03E, @@ -1943,7 +1947,7 @@ 2EA5C343F865CED412BD5E20, E95E181406F96A95EF81C474, 98DB1513FFCA4DC380991BE7, ); buildRules = ( ); dependencies = ( ); name = "OSCReceiver - App"; productName = OSCReceiver; productReference = 0AB2F0BDAF44CF1FE7BA007A; productType = "com.apple.product-type.application"; }; - 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; + 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; }; rootObject = 9CDCD4F1CF6D5405D574A953; } diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln index 4befe96ff1..38592a2af8 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln @@ -1031,6 +1031,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1063,6 +1064,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln index 865fb5dd5a..fd21fe6c1e 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln @@ -1031,6 +1031,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1063,6 +1064,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj b/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj index 8a44bb98c6..5ec292e8c6 100644 --- a/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj +++ b/examples/OSCReceiver/Builds/iOS/OSCReceiver.xcodeproj/project.pbxproj @@ -636,6 +636,7 @@ C071DED5E9CC19690E9FC598 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; }; C0B4E07EA4915B01617B0A9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; }; C1304780621DE055F575181F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PNGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_PNGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; + C1B9B9083812B8F9C7BA0231 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C1F24281F4140662C233E39B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TabbedButtonBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_TabbedButtonBar.h"; sourceTree = "SOURCE_ROOT"; }; C28118368FF1AD6BC7510AC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropContainer.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h"; sourceTree = "SOURCE_ROOT"; }; C2A45982E05ECE2A0F3C40E7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_X11_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -798,6 +799,7 @@ F23C5769A7FC4B9DB4DF5C2C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; }; F25C3FD19868F480AE07C8B1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Random.h"; path = "../../../../modules/juce_core/maths/juce_Random.h"; sourceTree = "SOURCE_ROOT"; }; F26E02D6360ECA56393F94F0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AffineTransform.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"; sourceTree = "SOURCE_ROOT"; }; + F279DB07DEFE502A1343DAE3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; F291A8E4DBD8D2BC7FB33290 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsList.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp"; sourceTree = "SOURCE_ROOT"; }; F2A22BCDF323121A2B138E66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; }; F2EAD1FE87BE27F14FF5BD56 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FillType.cpp"; path = "../../../../modules/juce_graphics/colour/juce_FillType.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1720,7 +1722,8 @@ 358EED724ABC645D714E4015 = {isa = PBXGroup; children = ( 507DCF40818D5D16D19A5328, ABBB192D4B75A5C26EFB1664, - 42E1D32A388CEF815E7C9A31, ); name = embedding; sourceTree = ""; }; + 42E1D32A388CEF815E7C9A31, + C1B9B9083812B8F9C7BA0231, ); name = embedding; sourceTree = ""; }; 57FD9ADFE7987A86CD925761 = {isa = PBXGroup; children = ( BEEF29E02364652DC0B3E5F0, A9075C2C2085DB0064BE4B38, @@ -1747,6 +1750,7 @@ FA0684965B9183AB6F7B9917, 857559CF8B878D79B5938CCC, 1BC2675D425BC6F6E5950EB5, + F279DB07DEFE502A1343DAE3, 7DAFB1EF06E70BF521A9D54B, A76D99FB25C1EC8A8ABBB438, 505A9B54AA3630ED7DD6D03E, @@ -1953,7 +1957,7 @@ 2EA5C343F865CED412BD5E20, E95E181406F96A95EF81C474, 98DB1513FFCA4DC380991BE7, ); buildRules = ( ); dependencies = ( ); name = "OSCReceiver - App"; productName = OSCReceiver; productReference = 0AB2F0BDAF44CF1FE7BA007A; productType = "com.apple.product-type.application"; }; - 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; + 9CDCD4F1CF6D5405D574A953 = {isa = PBXProject; buildConfigurationList = 26D2BBF40A8AF71F3DDC53E0; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 5E1B6101A5D94EDEE60C306A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 9C0E80FC020192937C98CFC2; projectDirPath = ""; projectRoot = ""; targets = (5E1B6101A5D94EDEE60C306A); }; }; rootObject = 9CDCD4F1CF6D5405D574A953; } diff --git a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h index a7a389d312..6b449e522c 100644 --- a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h +++ b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h @@ -113,10 +113,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java index 4f723709e0..98d02c3dcd 100644 --- a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java +++ b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java @@ -1164,8 +1164,8 @@ public class OSCSender extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj b/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj index a77761c116..f3f51ab813 100644 --- a/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj +++ b/examples/OSCSender/Builds/MacOSX/OSCSender.xcodeproj/project.pbxproj @@ -1777,7 +1777,7 @@ 1E9F219D82037569524E98CF, CDCF3ED48FB54EFBE0DD9046, 53E02F5676BF451851C9C06E, ); buildRules = ( ); dependencies = ( ); name = "OSCSender - App"; productName = OSCSender; productReference = E6F7F38EEF1BA55231F5B1D4; productType = "com.apple.product-type.application"; }; - 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; + 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; }; rootObject = 9CD8E1E30EDAF4E86990F260; } diff --git a/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj b/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj index 1a8194e614..5a58211a1a 100644 --- a/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj +++ b/examples/OSCSender/Builds/iOS/OSCSender.xcodeproj/project.pbxproj @@ -1791,7 +1791,7 @@ 1E9F219D82037569524E98CF, CDCF3ED48FB54EFBE0DD9046, 53E02F5676BF451851C9C06E, ); buildRules = ( ); dependencies = ( ); name = "OSCSender - App"; productName = OSCSender; productReference = E6F7F38EEF1BA55231F5B1D4; productType = "com.apple.product-type.application"; }; - 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; + 9CD8E1E30EDAF4E86990F260 = {isa = PBXProject; buildConfigurationList = ABFD3DA91CD9955D1FEC14F5; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 3D76C0E767055A9B4699DD95 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 168BF90B7EF8C12090B0A9B2; projectDirPath = ""; projectRoot = ""; targets = (3D76C0E767055A9B4699DD95); }; }; rootObject = 9CD8E1E30EDAF4E86990F260; } diff --git a/examples/OSCSender/JuceLibraryCode/AppConfig.h b/examples/OSCSender/JuceLibraryCode/AppConfig.h index 4df34f7541..cf65362380 100644 --- a/examples/OSCSender/JuceLibraryCode/AppConfig.h +++ b/examples/OSCSender/JuceLibraryCode/AppConfig.h @@ -110,7 +110,3 @@ #ifndef JUCE_USE_XCURSOR //#define JUCE_USE_XCURSOR #endif - -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif diff --git a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj index 83f8d21dfa..7475752fbe 100644 --- a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj +++ b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj @@ -566,6 +566,7 @@ 72723038519B5AB5FFB52EB9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectShowComponent.cpp"; path = "../../../../modules/juce_video/native/juce_win32_DirectShowComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 72B3FF3E4E9060A4F06F89F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IIRFilterAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; }; 72E1B34915000641B7AD80EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_CommonFile.cpp"; path = "../../../../modules/juce_core/native/juce_linux_CommonFile.cpp"; sourceTree = "SOURCE_ROOT"; }; + 7350B6210B03ACEB97C06C8B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 73636C4935CD275E66A85104 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CoreAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; 73861DEE4EEBFF77B6293F90 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RenderingHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_RenderingHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 7392F4B60E4E28A340E465BE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_TextPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -857,6 +858,7 @@ B607DF0E27752A1B9A863CC6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; }; B632B53930F795E159D0833E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "res_books_uncoupled.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/uncoupled/res_books_uncoupled.h"; sourceTree = "SOURCE_ROOT"; }; B68B3E0BE0396ACD3CA52250 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadower.h"; path = "../../../../modules/juce_gui_basics/misc/juce_DropShadower.h"; sourceTree = "SOURCE_ROOT"; }; + B6D0AAB3DB2FD210237F69FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; B73DF787FC51F08E279923A6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; }; B7612EA3B34C6AC48079A447 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VST3Headers.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_VST3Headers.h"; sourceTree = "SOURCE_ROOT"; }; B77BD5847F412656109A378E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextInputTarget.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextInputTarget.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2473,7 +2475,8 @@ 665DE861CFB7D14C2074451D = {isa = PBXGroup; children = ( E3381BC529641894F95F9AD6, 9FBCE80E444BA9E69C3F6172, - AC4730773DE422AE346C6D6B, ); name = embedding; sourceTree = ""; }; + AC4730773DE422AE346C6D6B, + B6D0AAB3DB2FD210237F69FE, ); name = embedding; sourceTree = ""; }; 975F70F112F3802E4717393E = {isa = PBXGroup; children = ( F9A0A82AA4D8EDB4B2305849, 7109E1D6A2AD7A013453C922, @@ -2500,6 +2503,7 @@ 77BAA6C13A52BE0F0A42FD0E, 67A664CAC881BB8175CBBB16, 29069A0F0B584C1995ACE3A5, + 7350B6210B03ACEB97C06C8B, 79728934D091CBA959AD2B20, F2DE7A0F77BCCBCFEEC0B500, B73DF787FC51F08E279923A6, @@ -2772,7 +2776,7 @@ 56C1AB4D5E9F6E55C4A4D18C, 9C76B98AD0B6E256C4C90D77, 9CAA70AAF55A5D696C59AA51, ); buildRules = ( ); dependencies = ( ); name = "OpenGLAppExample - App"; productName = OpenGLAppExample; productReference = 7451C664E0B1FF42F028813E; productType = "com.apple.product-type.application"; }; - 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; + 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; }; rootObject = 92078120DD024E75D724B8AB; } diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln index 7a07019d09..ee9fe1e43b 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln @@ -1490,6 +1490,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1522,6 +1523,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj index ca5b920c81..cc75d590f0 100644 --- a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj +++ b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample.xcodeproj/project.pbxproj @@ -567,6 +567,7 @@ 72723038519B5AB5FFB52EB9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectShowComponent.cpp"; path = "../../../../modules/juce_video/native/juce_win32_DirectShowComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 72B3FF3E4E9060A4F06F89F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IIRFilterAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; }; 72E1B34915000641B7AD80EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_CommonFile.cpp"; path = "../../../../modules/juce_core/native/juce_linux_CommonFile.cpp"; sourceTree = "SOURCE_ROOT"; }; + 7350B6210B03ACEB97C06C8B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 73636C4935CD275E66A85104 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CoreAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; 73861DEE4EEBFF77B6293F90 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RenderingHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_RenderingHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 7392F4B60E4E28A340E465BE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_TextPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -858,6 +859,7 @@ B607DF0E27752A1B9A863CC6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; }; B632B53930F795E159D0833E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "res_books_uncoupled.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/uncoupled/res_books_uncoupled.h"; sourceTree = "SOURCE_ROOT"; }; B68B3E0BE0396ACD3CA52250 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadower.h"; path = "../../../../modules/juce_gui_basics/misc/juce_DropShadower.h"; sourceTree = "SOURCE_ROOT"; }; + B6D0AAB3DB2FD210237F69FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; B73DF787FC51F08E279923A6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; }; B7612EA3B34C6AC48079A447 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VST3Headers.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_VST3Headers.h"; sourceTree = "SOURCE_ROOT"; }; B77BD5847F412656109A378E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextInputTarget.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextInputTarget.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2473,7 +2475,8 @@ 665DE861CFB7D14C2074451D = {isa = PBXGroup; children = ( E3381BC529641894F95F9AD6, 9FBCE80E444BA9E69C3F6172, - AC4730773DE422AE346C6D6B, ); name = embedding; sourceTree = ""; }; + AC4730773DE422AE346C6D6B, + B6D0AAB3DB2FD210237F69FE, ); name = embedding; sourceTree = ""; }; 975F70F112F3802E4717393E = {isa = PBXGroup; children = ( F9A0A82AA4D8EDB4B2305849, 7109E1D6A2AD7A013453C922, @@ -2500,6 +2503,7 @@ 77BAA6C13A52BE0F0A42FD0E, 67A664CAC881BB8175CBBB16, 29069A0F0B584C1995ACE3A5, + 7350B6210B03ACEB97C06C8B, 79728934D091CBA959AD2B20, F2DE7A0F77BCCBCFEEC0B500, B73DF787FC51F08E279923A6, @@ -2778,7 +2782,7 @@ 56C1AB4D5E9F6E55C4A4D18C, 9C76B98AD0B6E256C4C90D77, 9CAA70AAF55A5D696C59AA51, ); buildRules = ( ); dependencies = ( ); name = "OpenGLAppExample - App"; productName = OpenGLAppExample; productReference = 7451C664E0B1FF42F028813E; productType = "com.apple.product-type.application"; }; - 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; + 92078120DD024E75D724B8AB = {isa = PBXProject; buildConfigurationList = 46FEBDB3E8E7421830E627F2; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 9F2051B91F59B036C151A2F9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 5EB8D0E327356FA2D5323013; projectDirPath = ""; projectRoot = ""; targets = (9F2051B91F59B036C151A2F9); }; }; rootObject = 92078120DD024E75D724B8AB; } diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index be57625c7c..f6901bac54 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -191,10 +191,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj b/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj index 7f508bbad8..6b5e5590c9 100644 --- a/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj +++ b/examples/PluckedStringsDemo/Builds/MacOSX/PluckedStringsDemo.xcodeproj/project.pbxproj @@ -488,6 +488,7 @@ 65F3CDA0D0479E6FC42013FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedReadLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedReadLock.h"; sourceTree = "SOURCE_ROOT"; }; 663207923A3359F998A52792 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Javascript.h"; path = "../../../../modules/juce_core/javascript/juce_Javascript.h"; sourceTree = "SOURCE_ROOT"; }; 66381688BC4452212A4E1233 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "setup_8.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_8.h"; sourceTree = "SOURCE_ROOT"; }; + 66783E00DABE807CBAB3DDAC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 66C4584304E7F5B3D4470C85 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedWriteLock.h"; sourceTree = "SOURCE_ROOT"; }; 66CB68AF65C6F4D9BC9CCEE2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScrollBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ScrollBar.h"; sourceTree = "SOURCE_ROOT"; }; 66E077B879AAC571E92FCFE8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = "../../../../modules/juce_core/zip/zlib/zutil.c"; sourceTree = "SOURCE_ROOT"; }; @@ -597,6 +598,7 @@ 80187D9602541B6520358225 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryInputStream.h"; path = "../../../../modules/juce_core/streams/juce_MemoryInputStream.h"; sourceTree = "SOURCE_ROOT"; }; 804EEAC995CAB8564151AB19 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioIODevice.cpp"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp"; sourceTree = "SOURCE_ROOT"; }; 8053F38ECD9D9C004CF9FF7D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LinkedListPointer.h"; path = "../../../../modules/juce_core/containers/juce_LinkedListPointer.h"; sourceTree = "SOURCE_ROOT"; }; + 8059FEA9312B3D270EE2F93B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 80930811C3C2D1F258F426AE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiMessageCollector.cpp"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp"; sourceTree = "SOURCE_ROOT"; }; 811F028338F22E417E63D050 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AsyncUpdater.h"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.h"; sourceTree = "SOURCE_ROOT"; }; 815625B94E5D2820523EE42E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2456,7 +2458,8 @@ 50657695C6514CB7252B2642 = {isa = PBXGroup; children = ( 356F3858F9A4DE6055FAA59F, A419D46EB6EFFE889E0B892E, - 9ACD926CC73948E98781603E, ); name = embedding; sourceTree = ""; }; + 9ACD926CC73948E98781603E, + 66783E00DABE807CBAB3DDAC, ); name = embedding; sourceTree = ""; }; 9A242F5162E93D96F2B59915 = {isa = PBXGroup; children = ( F74768E6FDB668CFC1AB57ED, 8832699DA05AF3E69754D928, @@ -2483,6 +2486,7 @@ 4DE9AB4F1B7D277708620A4C, E87212B73A57F2A00C5CCE74, C3BFB2B893AD63A10388F997, + 8059FEA9312B3D270EE2F93B, C07D3C95EAC661548028A248, 98BA53EAA702029BB8B66D6B, F6AEBB945D6263EC19184122, @@ -2678,7 +2682,7 @@ 28277E0496F9A366F1E8A121, 5EDB4F61A6B9E9073901673E, 922CC2B83A0B55C36D188E46, ); buildRules = ( ); dependencies = ( ); name = "PluckedStringsDemo - App"; productName = PluckedStringsDemo; productReference = 3A8608CBA979E2BD17B50D0E; productType = "com.apple.product-type.application"; }; - 209D68C0E5F80B54B99D6435 = {isa = PBXProject; buildConfigurationList = DE12D5F044F75EB7B3CF17BB; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { B15B6C659E27D8982A94F805 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = B4D11720461A13D5D9F3E047; projectDirPath = ""; projectRoot = ""; targets = (B15B6C659E27D8982A94F805); }; + 209D68C0E5F80B54B99D6435 = {isa = PBXProject; buildConfigurationList = DE12D5F044F75EB7B3CF17BB; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { B15B6C659E27D8982A94F805 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = B4D11720461A13D5D9F3E047; projectDirPath = ""; projectRoot = ""; targets = (B15B6C659E27D8982A94F805); }; }; rootObject = 209D68C0E5F80B54B99D6435; } diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln index 47df5b51a9..eb1e44dfd8 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln @@ -1513,6 +1513,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1545,6 +1546,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln index a763522c82..a00f1b15fd 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln @@ -1513,6 +1513,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1545,6 +1546,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h index 29bce453c7..94e501e537 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h @@ -200,10 +200,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj index 22734f1c36..2817c44212 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj @@ -186,6 +186,7 @@ 1C95BEA7DFF54D0E0EDCBE00 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = "../../../../../modules/juce_graphics/image_formats/jpglib/jcsample.c"; sourceTree = "SOURCE_ROOT"; }; 1CAA2344959E3119A1FD81FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryInputStream.h"; path = "../../../../../modules/juce_core/streams/juce_MemoryInputStream.h"; sourceTree = "SOURCE_ROOT"; }; 1CAAE99247B398FFF508E4B3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableComposite.h"; path = "../../../../../modules/juce_gui_basics/drawables/juce_DrawableComposite.h"; sourceTree = "SOURCE_ROOT"; }; + 1D5254EEE971844911CBF216 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 1EBD453FA4CD3BA3AFC8C301 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLExtensions.h"; path = "../../../../../modules/juce_opengl/native/juce_OpenGLExtensions.h"; sourceTree = "SOURCE_ROOT"; }; 1F1F45E88D89328ABE527F50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PluginDescription.cpp"; path = "../../../../../modules/juce_audio_processors/processors/juce_PluginDescription.cpp"; sourceTree = "SOURCE_ROOT"; }; 1F397A7E48CFC9AEAEADBE27 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AttributedString.cpp"; path = "../../../../../modules/juce_graphics/fonts/juce_AttributedString.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1107,6 +1108,7 @@ D1D43810FD94A2728CC43D7F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VST3Common.h"; path = "../../../../../modules/juce_audio_processors/format_types/juce_VST3Common.h"; sourceTree = "SOURCE_ROOT"; }; D314DF0A28818B3DF91342E5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyPress.cpp"; path = "../../../../../modules/juce_gui_basics/keyboard/juce_KeyPress.cpp"; sourceTree = "SOURCE_ROOT"; }; D37FD881B066CAF213F49F54 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ogg.h; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/ogg.h"; sourceTree = "SOURCE_ROOT"; }; + D3A674261820187A0E64B08C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D433408E46A1409A9C033143 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AlertWindow.h"; path = "../../../../../modules/juce_gui_basics/windows/juce_AlertWindow.h"; sourceTree = "SOURCE_ROOT"; }; D4407C9C36B5C4B11373015F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyPressMappingSet.cpp"; path = "../../../../../modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp"; sourceTree = "SOURCE_ROOT"; }; D452CBBC4737DB8E4C8B1829 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = floor1.c; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor1.c"; sourceTree = "SOURCE_ROOT"; }; @@ -2701,7 +2703,8 @@ 242E4A227E1F7D44990EDDC0 = {isa = PBXGroup; children = ( 72AB7E80EFC4EDC44D3EF55F, B86FFB991F7841AB991C4A68, - B032C343B2510BBC0D81739B, ); name = embedding; sourceTree = ""; }; + B032C343B2510BBC0D81739B, + 1D5254EEE971844911CBF216, ); name = embedding; sourceTree = ""; }; AE72283FA4178BD56B597BC4 = {isa = PBXGroup; children = ( 6BF7603CA1E14C2C80D40726, A9E3EBF2A274EE7708731BA6, @@ -2728,6 +2731,7 @@ 68E85D93B68E7305E6ABF8B5, 15A806E26C246CFAD527B16C, 3C6EFB4FED2F8DB49334A243, + D3A674261820187A0E64B08C, D8581F2EDC5AF67078C87F04, ABE7925A8A2E061D0ADBC89B, 333B1B17AC6BBF4E5330BA2A, @@ -3210,7 +3214,7 @@ 9E93B5D7B33591139054C54E, ); runOnlyForDeploymentPostprocessing = 0; }; 319717B733C323BE76160BD4 = {isa = PBXNativeTarget; buildConfigurationList = AFF7B7B2889999928579D32F; buildPhases = ( 1CDAF3706AC2D6D164846859, ); buildRules = ( ); dependencies = ( ); name = "Arpeggiator - Shared Code"; productName = Arpeggiator; productReference = 6C612817F52B969A5F16CE94; productType = "com.apple.product-type.library.static"; }; - 4A5323BE8842B95E4FCCD6ED = {isa = PBXProject; buildConfigurationList = B601BADC34558F9AD61C80D7; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 08D74DB290FCD09A8D4810BB = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };892A28E616D56F05C8C11049 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };07D9D33E3466A8A497086BEE = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };319717B733C323BE76160BD4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 7678EFC533FC99BEEF151913; projectDirPath = ""; projectRoot = ""; targets = (08D74DB290FCD09A8D4810BB, 892A28E616D56F05C8C11049, 07D9D33E3466A8A497086BEE, 319717B733C323BE76160BD4); }; + 4A5323BE8842B95E4FCCD6ED = {isa = PBXProject; buildConfigurationList = B601BADC34558F9AD61C80D7; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 08D74DB290FCD09A8D4810BB = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };892A28E616D56F05C8C11049 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };07D9D33E3466A8A497086BEE = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };319717B733C323BE76160BD4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 7678EFC533FC99BEEF151913; projectDirPath = ""; projectRoot = ""; targets = (08D74DB290FCD09A8D4810BB, 892A28E616D56F05C8C11049, 07D9D33E3466A8A497086BEE, 319717B733C323BE76160BD4); }; }; rootObject = 4A5323BE8842B95E4FCCD6ED; } diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln index a9f47198d4..e2bc9da5b7 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln @@ -1627,6 +1627,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1659,6 +1660,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln index fc2e40dacd..a424ebe5fb 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln @@ -1627,6 +1627,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1659,6 +1660,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index 18532c899c..13eaf937cf 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj index 38b0ffffec..576c12a218 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj @@ -589,6 +589,7 @@ 6C2B7D995AEF715D3AE1CAFE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUOutputBase.cpp; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUOutputBase.cpp"; sourceTree = "SOURCE_ROOT"; }; 6CCC43F0415F56D3EDA6465D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; }; 6CFCABC6B50C43F1D69A769D = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; + 6D5D6E0D3BA7C58C1D5D13CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 6D6FD07009B389ACEBA0D26D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUCarbonViewBase.h; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUCarbonViewBase.h"; sourceTree = "SOURCE_ROOT"; }; 6DAE7A631250A68930AD6487 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; }; 6DE55D6FEBD2B42C85020516 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Desktop.h"; path = "../../../../../modules/juce_gui_basics/components/juce_Desktop.h"; sourceTree = "SOURCE_ROOT"; }; @@ -833,6 +834,7 @@ 9E0CDFA686934102489C5083 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; }; 9E2A17A739BE8605D8C13CFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUBaseHelper.h; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBaseHelper.h"; sourceTree = "SOURCE_ROOT"; }; 9E4C67EE120E7FE1F994CFB0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XMLCodeTokeniser.cpp"; path = "../../../../../modules/juce_gui_extra/code_editor/juce_XMLCodeTokeniser.cpp"; sourceTree = "SOURCE_ROOT"; }; + 9E6B37AA340B01011D5EB069 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 9E8230460D5C4094B17679B1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeCoordinatePositioner.h"; path = "../../../../../modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h"; sourceTree = "SOURCE_ROOT"; }; 9EBB58BBF4A22642EA4F98AF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = alloc.h; path = "../../../../../modules/juce_audio_formats/codecs/flac/alloc.h"; sourceTree = "SOURCE_ROOT"; }; 9F275CD0C6A3655AF458BDF1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CADebugMacros.h; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CADebugMacros.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2706,7 +2708,8 @@ 5956E0F117407BD87F27B5BB = {isa = PBXGroup; children = ( EE68D617C21D6400FFDC08E3, FD61CCFB4E650BDE5D74106F, - 6408C07642D68B3E4BB0EE3A, ); name = embedding; sourceTree = ""; }; + 6408C07642D68B3E4BB0EE3A, + 6D5D6E0D3BA7C58C1D5D13CE, ); name = embedding; sourceTree = ""; }; 28FBA3CB18C4525209481A8F = {isa = PBXGroup; children = ( D4936C5F17964AA78F13A0C4, D2BF2B664333C5D3D6DDEC5E, @@ -2733,6 +2736,7 @@ 9D71A93E47412CB9B4C037F9, D13B3A83FF3D34365C42FAFF, EF6E6F51B72E3ED4D09BCBC2, + 9E6B37AA340B01011D5EB069, 112A2BC97499C68DFFD78722, D2FC90C1C2179B9437A8C2B5, 0139B0DCCC893F803EB8C752, @@ -3318,7 +3322,7 @@ DBB093FB9913BE37F564E2AE, ); runOnlyForDeploymentPostprocessing = 0; }; EF7E12AA943CABF4C9ACE9FC = {isa = PBXNativeTarget; buildConfigurationList = 2D1D1BFA76D5FF752D06187F; buildPhases = ( E57E58AA3A8632B697CF894F, ); buildRules = ( ); dependencies = ( ); name = "GainPlugIn - Shared Code"; productName = GainPlugIn; productReference = 074F1E0FAFBD4B127B869BC2; productType = "com.apple.product-type.library.static"; }; - 14B1FDE882BA4A9678780A26 = {isa = PBXProject; buildConfigurationList = 738DD13F786359A977312E92; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 67946078D4B1207C2A6BDB4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BBE761975F619DAA1B4D0F57 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };8777AC1501FECCF360363C10 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };95B232D53C8384ECDA8C519B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };EF7E12AA943CABF4C9ACE9FC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 807311746F9F870D03BE88D9; projectDirPath = ""; projectRoot = ""; targets = (67946078D4B1207C2A6BDB4F, BBE761975F619DAA1B4D0F57, 8777AC1501FECCF360363C10, 95B232D53C8384ECDA8C519B, EF7E12AA943CABF4C9ACE9FC); }; + 14B1FDE882BA4A9678780A26 = {isa = PBXProject; buildConfigurationList = 738DD13F786359A977312E92; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 67946078D4B1207C2A6BDB4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BBE761975F619DAA1B4D0F57 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };8777AC1501FECCF360363C10 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };95B232D53C8384ECDA8C519B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };EF7E12AA943CABF4C9ACE9FC = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 807311746F9F870D03BE88D9; projectDirPath = ""; projectRoot = ""; targets = (67946078D4B1207C2A6BDB4F, BBE761975F619DAA1B4D0F57, 8777AC1501FECCF360363C10, 95B232D53C8384ECDA8C519B, EF7E12AA943CABF4C9ACE9FC); }; }; rootObject = 14B1FDE882BA4A9678780A26; } diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln index 6726a45d48..63f6321b06 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln @@ -1632,6 +1632,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1664,6 +1665,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln index ca5e911ba0..cf75c3cb2f 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln @@ -1632,6 +1632,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1664,6 +1665,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index bd303bb435..02c73ec682 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj index ee0b8c6630..ba6f84a2a6 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj @@ -519,6 +519,7 @@ 62C91968329AC5D48D332BEB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MPENote.cpp"; path = "../../../../../modules/juce_audio_basics/mpe/juce_MPENote.cpp"; sourceTree = "SOURCE_ROOT"; }; 634009ACA8AF6C3186672E06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeCoordinate.cpp"; path = "../../../../../modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp"; sourceTree = "SOURCE_ROOT"; }; 639C620BCA12D6F78F527734 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_utils.h"; path = "../../../../../modules/juce_audio_utils/juce_audio_utils.h"; sourceTree = "SOURCE_ROOT"; }; + 63CDE44B58C8311286FCD64D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 63D43922E63C78A5A350D9CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PluginDirectoryScanner.cpp"; path = "../../../../../modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp"; sourceTree = "SOURCE_ROOT"; }; 63F67342743BB1DE6DB14A84 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUBuffer.cpp; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; 63FCE7B5E8941BD0CDDB2AF3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioPluginFormat.h"; path = "../../../../../modules/juce_audio_processors/format/juce_AudioPluginFormat.h"; sourceTree = "SOURCE_ROOT"; }; @@ -561,6 +562,7 @@ 6B07CE9D5BF171A759746E7F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RTAS_DigiCode3.cpp"; path = "../../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp"; sourceTree = "SOURCE_ROOT"; }; 6B09D84301A3C4E04298907D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Point.h"; path = "../../../../../modules/juce_graphics/geometry/juce_Point.h"; sourceTree = "SOURCE_ROOT"; }; 6B625C61EEF8B13A12E8183C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadower.h"; path = "../../../../../modules/juce_gui_basics/misc/juce_DropShadower.h"; sourceTree = "SOURCE_ROOT"; }; + 6B6B80B0727047BF1F50C43D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 6B82A87CAB88E6F9E808C5AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NewLine.h"; path = "../../../../../modules/juce_core/text/juce_NewLine.h"; sourceTree = "SOURCE_ROOT"; }; 6BAA686B11D33C4221FF09EB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallOutBox.h"; path = "../../../../../modules/juce_gui_basics/windows/juce_CallOutBox.h"; sourceTree = "SOURCE_ROOT"; }; 6C1349C1F53F928103CFB975 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AU_Shared.h"; path = "../../../../../modules/juce_audio_processors/format_types/juce_AU_Shared.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2687,7 +2689,8 @@ A02F53C52330CA0CF42B8E17 = {isa = PBXGroup; children = ( B0BA3652456FD117B712274A, 9D9A8B6F7183EAF1390594FB, - 03448D056D55934DAA91D0BF, ); name = embedding; sourceTree = ""; }; + 03448D056D55934DAA91D0BF, + 6B6B80B0727047BF1F50C43D, ); name = embedding; sourceTree = ""; }; 693D4F2CA4A34E6F20C6C11D = {isa = PBXGroup; children = ( 003C9FBEE1F21EE53EB9CA45, 2AB42902DB6A293E5719DC5A, @@ -2714,6 +2717,7 @@ 4CE6B338635D46927D5282B1, E4ADA27E31D7FCE1F817974F, ADB5D765C47A96ED5D0CE6E4, + 63CDE44B58C8311286FCD64D, 19D129BC658620ADBBFC75B4, 3925B9408352C6ACCE621D4E, 741A0EC8149146B09B6A7973, @@ -3007,7 +3011,7 @@ CA28F22C95EBC20CB37612FF, ); runOnlyForDeploymentPostprocessing = 0; }; A3401CC1AC6C5B89EFBAEF01 = {isa = PBXNativeTarget; buildConfigurationList = AA6F190D4FECB06C7A7A0658; buildPhases = ( 177DC2A7A303F23EDDE5183A, ); buildRules = ( ); dependencies = ( ); name = "InterAppAudioEffect - Shared Code"; productName = InterAppAudioEffect; productReference = 873711620EC157BCCFFF80B1; productType = "com.apple.product-type.library.static"; }; - DF3D0C1B88ADC0274AE6BD73 = {isa = PBXProject; buildConfigurationList = 016ACE6B9EC6F47020502F4F; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 03BD5476C606A5BA65CD4FDF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };51FB6E6A2D0998D38E999826 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 1; }; com.apple.Sandbox = { enabled = 0; }; }; };A3401CC1AC6C5B89EFBAEF01 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = EC01685A042C62251C5AF093; projectDirPath = ""; projectRoot = ""; targets = (03BD5476C606A5BA65CD4FDF, 51FB6E6A2D0998D38E999826, A3401CC1AC6C5B89EFBAEF01); }; + DF3D0C1B88ADC0274AE6BD73 = {isa = PBXProject; buildConfigurationList = 016ACE6B9EC6F47020502F4F; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 03BD5476C606A5BA65CD4FDF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };51FB6E6A2D0998D38E999826 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 1; }; com.apple.Sandbox = { enabled = 0; }; }; };A3401CC1AC6C5B89EFBAEF01 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = EC01685A042C62251C5AF093; projectDirPath = ""; projectRoot = ""; targets = (03BD5476C606A5BA65CD4FDF, 51FB6E6A2D0998D38E999826, A3401CC1AC6C5B89EFBAEF01); }; }; rootObject = DF3D0C1B88ADC0274AE6BD73; } diff --git a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h index 7ed841756f..f6a6a0a543 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h @@ -212,10 +212,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj index cba6132702..e0c10265db 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj @@ -270,6 +270,7 @@ 2C90CCBB0A3A412308060408 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUInputFormatConverter.h; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUInputFormatConverter.h"; sourceTree = "SOURCE_ROOT"; }; 2CC0DDEFE8DADE574DA9897D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChannelRemappingAudioSource.h"; path = "../../../../../modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h"; sourceTree = "SOURCE_ROOT"; }; 2CC4531721B860EC2CFFC5CA = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 2CC776B13A5121F93B3C05B7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 2CD7132D2CF34E16279E945C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_JackAudio.cpp"; path = "../../../../../modules/juce_audio_devices/native/juce_linux_JackAudio.cpp"; sourceTree = "SOURCE_ROOT"; }; 2CD9FAF998B90D80DB720CA4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Windowing.mm"; path = "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm"; sourceTree = "SOURCE_ROOT"; }; 2CDCE436A4B3AD37E33970A0 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; @@ -1114,6 +1115,7 @@ CE7AB9CEBC2AD27B236A69F8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StandaloneFilterApp.cpp"; path = "../../../../../modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp"; sourceTree = "SOURCE_ROOT"; }; CEA5C634122F13B61BC06B2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_SystemTrayIcon.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; }; CEEC9947F99D7F39C77DE79B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedValueSet.cpp"; path = "../../../../../modules/juce_core/containers/juce_NamedValueSet.cpp"; sourceTree = "SOURCE_ROOT"; }; + CEF1AA83502CE86FEF60501F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; CF2A59FABE1AEC5251A7C9A6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAAudioChannelLayout.cpp; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAAudioChannelLayout.cpp"; sourceTree = "SOURCE_ROOT"; }; D01619CC43F88EC81883B673 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ShapeButton.h"; path = "../../../../../modules/juce_gui_basics/buttons/juce_ShapeButton.h"; sourceTree = "SOURCE_ROOT"; }; D06DCC799C2F8567B19C2B0A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Reverb.h"; path = "../../../../../modules/juce_audio_basics/effects/juce_Reverb.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2718,7 +2720,8 @@ 70AD9E4865B064C2D754E5ED = {isa = PBXGroup; children = ( 6F70D19AB56CF58341E90A50, D95291A612BB815DBBA22E54, - 3097659D55C1A02A39876DDD, ); name = embedding; sourceTree = ""; }; + 3097659D55C1A02A39876DDD, + 2CC776B13A5121F93B3C05B7, ); name = embedding; sourceTree = ""; }; 72C3C992F345B1C210C2CCF0 = {isa = PBXGroup; children = ( E3DAC7C3620B3B051926B3C0, AC0CFBC1681FFF1A011D7184, @@ -2745,6 +2748,7 @@ 300E1AADBE7B17F677E862B7, C0181B661B536441D8522121, 6B713E15C40AC9A87D6DF78D, + CEF1AA83502CE86FEF60501F, 83523069062525815BFD036F, 50DC7EC85DFFD11A5E01C92A, A53147DCDEB082194C22B621, @@ -3438,7 +3442,7 @@ 052356C35CC69AEC67B12929, ); runOnlyForDeploymentPostprocessing = 0; }; 744AC9FB5FF46367E6EAB865 = {isa = PBXNativeTarget; buildConfigurationList = 73259124A13B6ED37AC0BCEF; buildPhases = ( 6EE42F29415E0C1BCA23ACEE, ); buildRules = ( ); dependencies = ( ); name = "MultiOutSynth - Shared Code"; productName = MultiOutSynth; productReference = 03B7AAA7C11BC7F21B857177; productType = "com.apple.product-type.library.static"; }; - BEAECE0013C448921D99879E = {isa = PBXProject; buildConfigurationList = 7D1924CF413FEA0C1FCDF335; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { F142F5144E24B9733BC560AA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };B377E1482A96692F10D48B50 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };2CFA1B5A759BEA36D2129738 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };78448B618A99813B399CCE6A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };D7588383E404F0E9A3C21185 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };744AC9FB5FF46367E6EAB865 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = FB6D20503B6A21E15DD99922; projectDirPath = ""; projectRoot = ""; targets = (F142F5144E24B9733BC560AA, B377E1482A96692F10D48B50, 2CFA1B5A759BEA36D2129738, 78448B618A99813B399CCE6A, D7588383E404F0E9A3C21185, 744AC9FB5FF46367E6EAB865); }; + BEAECE0013C448921D99879E = {isa = PBXProject; buildConfigurationList = 7D1924CF413FEA0C1FCDF335; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { F142F5144E24B9733BC560AA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };B377E1482A96692F10D48B50 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };2CFA1B5A759BEA36D2129738 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };78448B618A99813B399CCE6A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };D7588383E404F0E9A3C21185 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };744AC9FB5FF46367E6EAB865 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = FB6D20503B6A21E15DD99922; projectDirPath = ""; projectRoot = ""; targets = (F142F5144E24B9733BC560AA, B377E1482A96692F10D48B50, 2CFA1B5A759BEA36D2129738, 78448B618A99813B399CCE6A, D7588383E404F0E9A3C21185, 744AC9FB5FF46367E6EAB865); }; }; rootObject = BEAECE0013C448921D99879E; } diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln index 8bd92002b9..39fe1c8eee 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln @@ -1642,6 +1642,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1674,6 +1675,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln index 008afae68e..36ac6d16f2 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln @@ -1642,6 +1642,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1674,6 +1675,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index f3e75b051b..bd6eef31dd 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj index abb34905c4..1811518d69 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj @@ -450,6 +450,7 @@ 52DE9B7272F528CD0B1040A5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_audio_plugin_client_RTAS_utils.cpp"; path = "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 52FA0D3E327CD3CF1E2A6DF5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormat.h"; path = "../../../../../modules/juce_audio_formats/format/juce_AudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; 530EA19F72B7574ADC2AC56A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "residue_8.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_8.h"; sourceTree = "SOURCE_ROOT"; }; + 5351028D771B01F2A8FD23CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 5358F77CA28E955BD172B6F7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUPlugInDispatch.cpp; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUPlugInDispatch.cpp"; sourceTree = "SOURCE_ROOT"; }; 53ACF0FF779761D3CB13642C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryMappedFile.h"; path = "../../../../../modules/juce_core/files/juce_MemoryMappedFile.h"; sourceTree = "SOURCE_ROOT"; }; 53B330EF8F975BD0F526CAB7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAVectorUnit.cpp; path = "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAVectorUnit.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -809,6 +810,7 @@ 9AD6A70D08B644E6406BD1E2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "res_books_stereo.h"; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/coupled/res_books_stereo.h"; sourceTree = "SOURCE_ROOT"; }; 9B2F97252A28CBC0532AC1C5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ToolbarButton.cpp"; path = "../../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp"; sourceTree = "SOURCE_ROOT"; }; 9B55A59CD39578E3164E2997 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Identifier.cpp"; path = "../../../../../modules/juce_core/text/juce_Identifier.cpp"; sourceTree = "SOURCE_ROOT"; }; + 9C039AA0FFD66F1D922EF7C2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../JuceLibraryCode/juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 9C48479A55EBFC4C22D4B7B5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageManager.h"; path = "../../../../../modules/juce_events/messages/juce_MessageManager.h"; sourceTree = "SOURCE_ROOT"; }; 9C779471720BDDE417ED9BE1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPathListComponent.cpp"; path = "../../../../../modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 9CC8CDF595616EEF33071A40 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableEdgeComponent.cpp"; path = "../../../../../modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -829,7 +831,6 @@ 8D84B63F343660AEE31FD166 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NoiseGate.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 943B88ECAC8C127556319A56 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 99DBD2D02979E38C288F1C7D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSampleBuffer.h"; path = "../../../../../modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h"; sourceTree = "SOURCE_ROOT"; }; - 9C039AA0FFD66F1D922EF7C2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../JuceLibraryCode/juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 9CBD130337083207F2B56452 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CharacterFunctions.cpp"; path = "../../../../../modules/juce_core/text/juce_CharacterFunctions.cpp"; sourceTree = "SOURCE_ROOT"; }; 9CCA07FAE3B4A4D2257497BA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; }; 9D67E9F6247EDE2E207EFE8C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CameraDevice.cpp"; path = "../../../../../modules/juce_video/capture/juce_CameraDevice.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -851,6 +852,7 @@ 9F9D896F664C8CA286C041FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Viewport.h"; path = "../../../../../modules/juce_gui_basics/layout/juce_Viewport.h"; sourceTree = "SOURCE_ROOT"; }; 9FB3DAAD402A11A090B0521C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IncludeSystemHeaders.h"; path = "../../../../../modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h"; sourceTree = "SOURCE_ROOT"; }; 9FD8096E8A6E070EB0D3E6F2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ActiveXComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; + 9FF773210D2D261B80C5359F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; A0189ED3EEAACC00AD4649EE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = codebook.h; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.h"; sourceTree = "SOURCE_ROOT"; }; A067B55828A6944BF5F96152 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChoicePropertyComponent.cpp"; path = "../../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A06D19395CD8A48E64CE9E16 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "juce_audio_plugin_client_RTAS.r"; path = "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; @@ -2711,7 +2713,8 @@ FF4F2D5144A03CFC9ED1B4F0 = {isa = PBXGroup; children = ( A8C57F454613C1A8D0FBFB0D, 1B5FCF5295A9F17EECC57377, - D50277531FEF09E12EC5E68B, ); name = embedding; sourceTree = ""; }; + D50277531FEF09E12EC5E68B, + 9FF773210D2D261B80C5359F, ); name = embedding; sourceTree = ""; }; 4CF48DAFE15B4E37E14F5562 = {isa = PBXGroup; children = ( D9F3CA6B36085DD021A4EAFF, 09FF4EBBB192D86FD93127D0, @@ -2738,6 +2741,7 @@ 8ABC8FFA9062954E385544CB, 0F83ECAFF8913C6D675BB235, 3AF4FA846523FAEE78639248, + 5351028D771B01F2A8FD23CA, 0891D111300794D1DB2C68AE, 2DD2731D86AFD89EA4C8BBB1, 11DB456241E04EC7D8CF40CC, @@ -3428,7 +3432,7 @@ 0DA5D6F818C57F8FAE4C618E, ); runOnlyForDeploymentPostprocessing = 0; }; C6A39FF70BF77051D89E2CE4 = {isa = PBXNativeTarget; buildConfigurationList = 17413E5C8ECD089086907FAE; buildPhases = ( 61132FB6D58EDB3690AECF80, ); buildRules = ( ); dependencies = ( ); name = "NoiseGate - Shared Code"; productName = NoiseGate; productReference = B15F50973CE5D365D77D282B; productType = "com.apple.product-type.library.static"; }; - BAD3113DEB12EFF472860A51 = {isa = PBXProject; buildConfigurationList = 1283F0CE36BC5AD8241EC08A; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { BE96E7C5FAB338297CC69BA9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };89095DFC434F1A8EB6368E3A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };822408E00D8E4658EE40468E = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C31F9AF2D73B265832C65F18 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };5B796CD6929336C2CDEDBCD1 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6A39FF70BF77051D89E2CE4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 1E8CE067EFE6F03AB97CACC0; projectDirPath = ""; projectRoot = ""; targets = (BE96E7C5FAB338297CC69BA9, 89095DFC434F1A8EB6368E3A, 822408E00D8E4658EE40468E, C31F9AF2D73B265832C65F18, 5B796CD6929336C2CDEDBCD1, C6A39FF70BF77051D89E2CE4); }; + BAD3113DEB12EFF472860A51 = {isa = PBXProject; buildConfigurationList = 1283F0CE36BC5AD8241EC08A; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { BE96E7C5FAB338297CC69BA9 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };89095DFC434F1A8EB6368E3A = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };822408E00D8E4658EE40468E = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C31F9AF2D73B265832C65F18 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };5B796CD6929336C2CDEDBCD1 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6A39FF70BF77051D89E2CE4 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 1E8CE067EFE6F03AB97CACC0; projectDirPath = ""; projectRoot = ""; targets = (BE96E7C5FAB338297CC69BA9, 89095DFC434F1A8EB6368E3A, 822408E00D8E4658EE40468E, C31F9AF2D73B265832C65F18, 5B796CD6929336C2CDEDBCD1, C6A39FF70BF77051D89E2CE4); }; }; rootObject = BAD3113DEB12EFF472860A51; } diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln index a095fba1ee..a25615d3aa 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln @@ -1637,6 +1637,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1669,6 +1670,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln index 1b1ee34582..acbfbb1f54 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln @@ -1637,6 +1637,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1669,6 +1670,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index 5d686e5c15..244621513d 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj index bbf4686c89..4ec72937ad 100644 --- a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj @@ -844,6 +844,7 @@ A225CB6D4E1FEA0E79DDE776 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Path.cpp"; path = "../../../../../modules/juce_graphics/geometry/juce_Path.cpp"; sourceTree = "SOURCE_ROOT"; }; A28E9D58711A59C0AFF79AAF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = "../../../../../modules/juce_graphics/image_formats/pnglib/pngwrite.c"; sourceTree = "SOURCE_ROOT"; }; A367A1757697F29B157B58EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandTarget.h"; path = "../../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h"; sourceTree = "SOURCE_ROOT"; }; + A379C7A76441AF293B4D9065 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; A4302A67A7EC2D0DCAACD44E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedObject.h"; path = "../../../../../modules/juce_core/memory/juce_ReferenceCountedObject.h"; sourceTree = "SOURCE_ROOT"; }; A4362F1C6092248CA95F5D9F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioSourcePlayer.cpp"; path = "../../../../../modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp"; sourceTree = "SOURCE_ROOT"; }; A458551FD64CCD79F3BE8C18 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FlacAudioFormat.cpp"; path = "../../../../../modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1228,6 +1229,7 @@ E926027E5704282DD6F4AFEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = floor1.c; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor1.c"; sourceTree = "SOURCE_ROOT"; }; E9501FE4D42D2C7F6A97EAA0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FlexBox.cpp"; path = "../../../../../modules/juce_gui_basics/layout/juce_FlexBox.cpp"; sourceTree = "SOURCE_ROOT"; }; E953B89607509135D337044D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = analysis.c; path = "../../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/analysis.c"; sourceTree = "SOURCE_ROOT"; }; + E95735840C4470E8887A8187 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; E9826AAFDC691D5BDB7E7F53 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableButton.cpp"; path = "../../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.cpp"; sourceTree = "SOURCE_ROOT"; }; E9D99C7B57FBA78B15C7B7C5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HashMap.h"; path = "../../../../../modules/juce_core/containers/juce_HashMap.h"; sourceTree = "SOURCE_ROOT"; }; E9ECB66E10CA8457574F51B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctfst.c; path = "../../../../../modules/juce_graphics/image_formats/jpglib/jfdctfst.c"; sourceTree = "SOURCE_ROOT"; }; @@ -2713,7 +2715,8 @@ A8DAEF7143DD55B8EA715602 = {isa = PBXGroup; children = ( F07EC2EFE5FFF0E2288711C3, F0EA00C89D6A18F12CD534EA, - 19027D68236606983C77475E, ); name = embedding; sourceTree = ""; }; + 19027D68236606983C77475E, + A379C7A76441AF293B4D9065, ); name = embedding; sourceTree = ""; }; 3DFF793C07E18238F9D1BA69 = {isa = PBXGroup; children = ( EFC569FE1968AEFA162BB956, A8C8E72535DCCA2FA51DA494, @@ -2740,6 +2743,7 @@ D29B42596F4354DB04AF9D0F, D83B561120304C930D9D011C, 4D52DB417382895AAEDA8CE6, + E95735840C4470E8887A8187, 9D869053AA7C5B8F9CBE90A1, C313DAE892A88AE7B0033A76, 5927772AE794231C7E19C2E8, @@ -3440,7 +3444,7 @@ E42654A1F7F310A289F36412, ); runOnlyForDeploymentPostprocessing = 0; }; ECF21C83A6EB88D73C09E713 = {isa = PBXNativeTarget; buildConfigurationList = 2027B4509482C03CE7628088; buildPhases = ( 533BEF452ABC455670C57273, ); buildRules = ( ); dependencies = ( ); name = "Surround - Shared Code"; productName = Surround; productReference = ED7C79D32D589E0F8123BB6A; productType = "com.apple.product-type.library.static"; }; - 1350D0395A6BD8D60471CF92 = {isa = PBXProject; buildConfigurationList = B617DCD972781EFAD4370890; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 662E24C61A67634787C1DDDA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BCE8135290C1E3CF37F2E6EA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };050134A7A9B0AD26AD788AB7 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };1406423C2E104DB2C01413A8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };3DE552C28C67B3599B47F6D5 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };ECF21C83A6EB88D73C09E713 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C16B685A8A4A888CBFC241D5; projectDirPath = ""; projectRoot = ""; targets = (662E24C61A67634787C1DDDA, BCE8135290C1E3CF37F2E6EA, 050134A7A9B0AD26AD788AB7, 1406423C2E104DB2C01413A8, 3DE552C28C67B3599B47F6D5, ECF21C83A6EB88D73C09E713); }; + 1350D0395A6BD8D60471CF92 = {isa = PBXProject; buildConfigurationList = B617DCD972781EFAD4370890; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 662E24C61A67634787C1DDDA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };BCE8135290C1E3CF37F2E6EA = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };050134A7A9B0AD26AD788AB7 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };1406423C2E104DB2C01413A8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };3DE552C28C67B3599B47F6D5 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };ECF21C83A6EB88D73C09E713 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C16B685A8A4A888CBFC241D5; projectDirPath = ""; projectRoot = ""; targets = (662E24C61A67634787C1DDDA, BCE8135290C1E3CF37F2E6EA, 050134A7A9B0AD26AD788AB7, 1406423C2E104DB2C01413A8, 3DE552C28C67B3599B47F6D5, ECF21C83A6EB88D73C09E713); }; }; rootObject = 1350D0395A6BD8D60471CF92; } diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln index 3f37474608..3b766ce4c1 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln @@ -1638,6 +1638,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1670,6 +1671,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln index dd4489017f..55c4f88022 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln @@ -1638,6 +1638,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1670,6 +1671,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index 130190e487..be2ef6b268 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj b/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj index 965f11fe54..13f4d31afe 100644 --- a/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj +++ b/examples/SimpleFFTExample/Builds/MacOSX/SimpleFFTExample.xcodeproj/project.pbxproj @@ -144,6 +144,7 @@ 1C65D2172BC8C6EE13917F9A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SelectedItemSet.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_SelectedItemSet.h"; sourceTree = "SOURCE_ROOT"; }; 1C86227F5F0CE8D63F78F5A3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; }; 1CAC81239CD80E42E652DEFC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; + 1CB5636F1DAE9A9868667C23 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 1CC5BBAF191962D9A5F05AEA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_CoreGraphicsHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 1D3494846CFE7D57284EA837 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedValueSetter.h"; path = "../../../../modules/juce_core/containers/juce_ScopedValueSetter.h"; sourceTree = "SOURCE_ROOT"; }; 1D9B928CF335F674ABEDB615 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComboBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ComboBox.h"; sourceTree = "SOURCE_ROOT"; }; @@ -279,6 +280,7 @@ 3DB6B17731D90CF701F28041 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioAppComponent.h"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioAppComponent.h"; sourceTree = "SOURCE_ROOT"; }; 3DE223B5FE082E7195359CE7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MPESynthesiserVoice.h"; path = "../../../../modules/juce_audio_basics/mpe/juce_MPESynthesiserVoice.h"; sourceTree = "SOURCE_ROOT"; }; 3E3AC99E3C0F826A0423BCE2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VST3Common.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_VST3Common.h"; sourceTree = "SOURCE_ROOT"; }; + 3E671C05F1E8D9D8825AFA9A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 3EE34508E499AEE33BB6EF66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PreferencesPanel.h"; path = "../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.h"; sourceTree = "SOURCE_ROOT"; }; 3EE727B1EDC227C6C3280559 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; }; 3EFCCFCB0D320AC9E067B280 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiFile.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiFile.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2452,7 +2454,8 @@ 7FCB59F7A71DDAF40012F86D = {isa = PBXGroup; children = ( DEB2A1A72DEB9F1DFD13EA49, 902CCD92C6A6F229DBFCEEFA, - 9C2F44E77A47FC3BA63194AB, ); name = embedding; sourceTree = ""; }; + 9C2F44E77A47FC3BA63194AB, + 1CB5636F1DAE9A9868667C23, ); name = embedding; sourceTree = ""; }; 146585440B72AFB8B23D59C3 = {isa = PBXGroup; children = ( 0056F14936A6432BB33F9F31, FDD9E936F40F91361D1EE79B, @@ -2479,6 +2482,7 @@ 4B7A54B76B2E07BD6F4C6442, DAF464343854A54F5FC987A6, 89728832B10847206C9FBB05, + 3E671C05F1E8D9D8825AFA9A, A8A8163407DF97075310A4DB, E5DB6AA42A1584C3A0D0E455, 504B3E5644AF228B1CFB051E, @@ -2674,7 +2678,7 @@ 48322B9DE3337E69E96F7551, 69128EEF3B23EA7E960EBE08, B8B3353D164D52CC62A584F2, ); buildRules = ( ); dependencies = ( ); name = "SimpleFFTExample - App"; productName = SimpleFFTExample; productReference = 8D8ED3E7474D65E7177750A8; productType = "com.apple.product-type.application"; }; - CF307CC82EF6FB552266854D = {isa = PBXProject; buildConfigurationList = C877108FC7BF2DA280A51F46; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { D0E4014BABB86AAE963C0EC0 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4DB04A617E8DFE6D06731154; projectDirPath = ""; projectRoot = ""; targets = (D0E4014BABB86AAE963C0EC0); }; + CF307CC82EF6FB552266854D = {isa = PBXProject; buildConfigurationList = C877108FC7BF2DA280A51F46; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D0E4014BABB86AAE963C0EC0 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4DB04A617E8DFE6D06731154; projectDirPath = ""; projectRoot = ""; targets = (D0E4014BABB86AAE963C0EC0); }; }; rootObject = CF307CC82EF6FB552266854D; } diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln index 67805960ff..6ac7fae0e3 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln @@ -1511,6 +1511,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1543,6 +1544,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln index 2021a8c904..7c129e1bb6 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln @@ -1511,6 +1511,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1543,6 +1544,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h index 29bce453c7..94e501e537 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h @@ -200,10 +200,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 8abfa19ff5..d6154f39c4 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -1218,6 +1218,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -1242,6 +1243,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -2463,6 +2465,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2487,6 +2490,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java index 6e3810bba9..e88d91219e 100644 --- a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java +++ b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java @@ -1965,8 +1965,8 @@ public class JuceDemoPlugin extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 0a2ea90198..a54fbad7b5 100644 --- a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -183,6 +183,7 @@ 19D63B88BE3B2620D7EB8489 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_processors.h"; path = "../../../../modules/juce_audio_processors/juce_audio_processors.h"; sourceTree = "SOURCE_ROOT"; }; 19F3E1F0B144D48016FDF6C0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedValueSet.cpp"; path = "../../../../modules/juce_core/containers/juce_NamedValueSet.cpp"; sourceTree = "SOURCE_ROOT"; }; 19FE75EF12C18CF52D11D37E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; }; + 1A433374BF54AD4057F91CB8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 1A842FCA201F57BF276F5F19 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CoreAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; 1A96F1E0E0A6A7DB0603D5C8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ConnectedChildProcess.cpp"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.cpp"; sourceTree = "SOURCE_ROOT"; }; 1B2CE3B669D290A88A797C1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NativeMessageBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h"; sourceTree = "SOURCE_ROOT"; }; @@ -242,7 +243,6 @@ 28F65EEAFB3B971E8EDB10F3 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; 28FD98C78FE1E918553D4C3D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAAUParameter.cpp; path = "../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAAUParameter.cpp"; sourceTree = "SOURCE_ROOT"; }; 291947B7C7CCCF7029BA0C78 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPathListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; - 2956FA046400383FC705C1CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; }; 29917AAA580F21BF2798D071 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryContentsDisplayComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h"; sourceTree = "SOURCE_ROOT"; }; 29E161596399FC43BD54CE59 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = vorbisenc.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisenc.c"; sourceTree = "SOURCE_ROOT"; }; 29F2C783F03A444EEF16FAA4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAAutoDisposer.h; path = "../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/CAAutoDisposer.h"; sourceTree = "SOURCE_ROOT"; }; @@ -254,6 +254,7 @@ 1AF4856520E8BFF4A039CD6B = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JuceDemoPlugin.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 2364D8B6DBA3B1974ED202E9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = vorbisfile.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/vorbisfile.h"; sourceTree = "SOURCE_ROOT"; }; 27F4717476D5073850BF7426 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUTimestampGenerator.h; path = "../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUTimestampGenerator.h"; sourceTree = "SOURCE_ROOT"; }; + 2956FA046400383FC705C1CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; }; 29BA2BABEFBB624A9EEE83F3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Misc.cpp"; path = "../../../../modules/juce_core/native/juce_android_Misc.cpp"; sourceTree = "SOURCE_ROOT"; }; 2A6E2BC2F602472C0FC70E68 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_plugin_client_AAX.mm"; path = "../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.mm"; sourceTree = "SOURCE_ROOT"; }; 2AA4939A70E1E1D6B907DA87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageConvolutionKernel.h"; path = "../../../../modules/juce_graphics/images/juce_ImageConvolutionKernel.h"; sourceTree = "SOURCE_ROOT"; }; @@ -865,6 +866,7 @@ A5C59910D72EC2107AB80DBA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_utils/audio_cd/juce_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; }; A67A07AC463F106BEB763964 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = codebook.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.c"; sourceTree = "SOURCE_ROOT"; }; A7055681554844E4708E27A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPath.cpp"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.cpp"; sourceTree = "SOURCE_ROOT"; }; + A799AE3C92A8C6114AA3228C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A7A527D783D3B38F455964D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnectionServer.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.h"; sourceTree = "SOURCE_ROOT"; }; A7C8D66431191DD3BA717895 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jdhuff.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdhuff.h"; sourceTree = "SOURCE_ROOT"; }; A7EE73FF3A5962BBF41DC2AB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../../../modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2710,7 +2712,8 @@ A40BB2A32471552906BE35B4 = {isa = PBXGroup; children = ( A11F51909BE2463C28099C0B, BCB54D2E4C0C3357DACFD29B, - FABC846A7451773CA5FEDA13, ); name = embedding; sourceTree = ""; }; + FABC846A7451773CA5FEDA13, + 1A433374BF54AD4057F91CB8, ); name = embedding; sourceTree = ""; }; AE2BE6BD9531C81583DA98CA = {isa = PBXGroup; children = ( 4BEE40628E4C3581FF774383, 7A1CD659BB507996CC7EE951, @@ -2737,6 +2740,7 @@ 219FBFE9990AA2ACA2F15FC1, 9AD803D0867B50C59501CF06, A52C3715EB8622212D9FEFC8, + A799AE3C92A8C6114AA3228C, A90E41C0C52BDF0CC82161C9, 07C4AC0C62F94DDFA1FA0E31, 19FE75EF12C18CF52D11D37E, @@ -3332,7 +3336,7 @@ 963703A2971006C8BB3D190E, ); runOnlyForDeploymentPostprocessing = 0; }; C3F206BB3277FBADE3BD615B = {isa = PBXNativeTarget; buildConfigurationList = 08D73ACBC0F6E2A4747629EE; buildPhases = ( 4E087312D44130771EB1E9C2, ); buildRules = ( ); dependencies = ( ); name = "JuceDemoPlugin - Shared Code"; productName = JuceDemoPlugin; productReference = 4D6248E85C22578615FA809C; productType = "com.apple.product-type.library.static"; }; - 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };921CB4BBA34ADBC5270F81EF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };71E1E34CFC671ACBBCE0726C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, 921CB4BBA34ADBC5270F81EF, 71E1E34CFC671ACBBCE0726C, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; + 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };921CB4BBA34ADBC5270F81EF = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };71E1E34CFC671ACBBCE0726C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, 921CB4BBA34ADBC5270F81EF, 71E1E34CFC671ACBBCE0726C, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; }; rootObject = 85250052F3E019894332668E; } diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln index c509fe7bd6..53a3423368 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln @@ -1661,6 +1661,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1693,6 +1694,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln index 1aab185365..3c388f3412 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln @@ -1661,6 +1661,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1693,6 +1694,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj index f63813d410..aa89046d12 100644 --- a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ 19D63B88BE3B2620D7EB8489 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_processors.h"; path = "../../../../modules/juce_audio_processors/juce_audio_processors.h"; sourceTree = "SOURCE_ROOT"; }; 19F3E1F0B144D48016FDF6C0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedValueSet.cpp"; path = "../../../../modules/juce_core/containers/juce_NamedValueSet.cpp"; sourceTree = "SOURCE_ROOT"; }; 19FE75EF12C18CF52D11D37E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; }; + 1A433374BF54AD4057F91CB8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 1A842FCA201F57BF276F5F19 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CoreAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h"; sourceTree = "SOURCE_ROOT"; }; 1A96F1E0E0A6A7DB0603D5C8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ConnectedChildProcess.cpp"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.cpp"; sourceTree = "SOURCE_ROOT"; }; 1B2CE3B669D290A88A797C1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NativeMessageBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h"; sourceTree = "SOURCE_ROOT"; }; @@ -847,6 +848,7 @@ A5C59910D72EC2107AB80DBA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_utils/audio_cd/juce_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; }; A67A07AC463F106BEB763964 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = codebook.c; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.c"; sourceTree = "SOURCE_ROOT"; }; A7055681554844E4708E27A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPath.cpp"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.cpp"; sourceTree = "SOURCE_ROOT"; }; + A799AE3C92A8C6114AA3228C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; A7A527D783D3B38F455964D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnectionServer.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.h"; sourceTree = "SOURCE_ROOT"; }; A7C8D66431191DD3BA717895 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jdhuff.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdhuff.h"; sourceTree = "SOURCE_ROOT"; }; A7EE73FF3A5962BBF41DC2AB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../../../modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2692,7 +2694,8 @@ A40BB2A32471552906BE35B4 = {isa = PBXGroup; children = ( A11F51909BE2463C28099C0B, BCB54D2E4C0C3357DACFD29B, - FABC846A7451773CA5FEDA13, ); name = embedding; sourceTree = ""; }; + FABC846A7451773CA5FEDA13, + 1A433374BF54AD4057F91CB8, ); name = embedding; sourceTree = ""; }; AE2BE6BD9531C81583DA98CA = {isa = PBXGroup; children = ( 4BEE40628E4C3581FF774383, 7A1CD659BB507996CC7EE951, @@ -2719,6 +2722,7 @@ 219FBFE9990AA2ACA2F15FC1, 9AD803D0867B50C59501CF06, A52C3715EB8622212D9FEFC8, + A799AE3C92A8C6114AA3228C, A90E41C0C52BDF0CC82161C9, 07C4AC0C62F94DDFA1FA0E31, 19FE75EF12C18CF52D11D37E, @@ -3099,7 +3103,7 @@ 963703A2971006C8BB3D190E, ); runOnlyForDeploymentPostprocessing = 0; }; C3F206BB3277FBADE3BD615B = {isa = PBXNativeTarget; buildConfigurationList = 08D73ACBC0F6E2A4747629EE; buildPhases = ( 4E087312D44130771EB1E9C2, ); buildRules = ( ); dependencies = ( ); name = "JuceDemoPlugin - Shared Code"; productName = JuceDemoPlugin; productReference = 4D6248E85C22578615FA809C; productType = "com.apple.product-type.library.static"; }; - 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; + 85250052F3E019894332668E = {isa = PBXProject; buildConfigurationList = 0720B453F376663EAB98BF9B; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { D4A200CA175E6673EB359B63 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C6D88D358CA321193FD3CC4F = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 1; }; }; };F2918F451F1385B37AF4A6ED = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; };C3F206BB3277FBADE3BD615B = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 4074359E1E7C4D54E87C3461; projectDirPath = ""; projectRoot = ""; targets = (D4A200CA175E6673EB359B63, C6D88D358CA321193FD3CC4F, F2918F451F1385B37AF4A6ED, C3F206BB3277FBADE3BD615B); }; }; rootObject = 85250052F3E019894332668E; } diff --git a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h index a4c805dcf1..1198a55e7d 100644 --- a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -212,10 +212,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index 7f4b608d8c..da4d585898 100644 --- a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -235,6 +235,7 @@ 245A4C5B4BF8CDA6D25AD34D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = codec.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/codec.h"; sourceTree = "SOURCE_ROOT"; }; 2483323E997B7A3171E39DE0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_graphics.h"; path = "../../../../modules/juce_graphics/juce_graphics.h"; sourceTree = "SOURCE_ROOT"; }; 24BB3E009554E23697C3E545 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryMappedFile.h"; path = "../../../../modules/juce_core/files/juce_MemoryMappedFile.h"; sourceTree = "SOURCE_ROOT"; }; + 24E570E22ECF5807AEF31AA2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 24EB96F7B504F9C0BFFCE5C8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CompilerSupport.h"; path = "../../../../modules/juce_core/system/juce_CompilerSupport.h"; sourceTree = "SOURCE_ROOT"; }; 253AE92DFB97286B43EECD89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_video.mm"; path = "../../JuceLibraryCode/juce_video.mm"; sourceTree = "SOURCE_ROOT"; }; 2566C16790C96712841F453D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jidctint.c"; sourceTree = "SOURCE_ROOT"; }; @@ -562,6 +563,7 @@ 69EA4B2E0B25996FA6A1AA5D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Registry.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Registry.cpp"; sourceTree = "SOURCE_ROOT"; }; 6A1B2858C988AA78ED3240F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiKeyboardComponent.h"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h"; sourceTree = "SOURCE_ROOT"; }; 6A5B9749B809D0483AA63F7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_mac_CoreMidi.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_mac_CoreMidi.cpp"; sourceTree = "SOURCE_ROOT"; }; + 6AA302DF0602225EE6741FDE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 6AD3D4BEBD59F0952EA7EF29 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jpegint.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jpegint.h"; sourceTree = "SOURCE_ROOT"; }; 6AE3C699BF301F95FC940635 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentAnimator.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentAnimator.h"; sourceTree = "SOURCE_ROOT"; }; 6BB739B3A2358F1253D4BC4F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_X11.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_X11.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2570,7 +2572,8 @@ 281C65AC1A7B02C5BC7D8D81 = {isa = PBXGroup; children = ( AE77174CBCCD8ED980D37836, 382380170B8E1B0FF39435F4, - 5085F1038F87BFFE07A491C4, ); name = embedding; sourceTree = ""; }; + 5085F1038F87BFFE07A491C4, + 24E570E22ECF5807AEF31AA2, ); name = embedding; sourceTree = ""; }; 7949900E0A648C91F3D97C00 = {isa = PBXGroup; children = ( E90924010E25657C573AFE2A, 9F5B773064345EFCF3C35D87, @@ -2597,6 +2600,7 @@ 940A181A1BAC2FA88FB5A3B3, B1EF6D5406DA59281A69E9B9, BCA0AF0491CD86CDD1875D5A, + 6AA302DF0602225EE6741FDE, B66C55352E6A5599E6A97737, 1FDCB594D94782C879005BF7, 151301C4733D26214E206116, @@ -2881,7 +2885,7 @@ 2429BB4D705CC57F49418CFB, E8E94B3C187DA578BFCBDA98, C515A1FE1A53D3968C22FAEF, ); buildRules = ( ); dependencies = ( ); name = "Plugin Host - App"; productName = "Plugin Host"; productReference = 8D8BBC353637DA442C5575DA; productType = "com.apple.product-type.application"; }; - ADE6E539DB98A302483A82D0 = {isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { DE12B7643D374BFF7E4FEB1C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = (DE12B7643D374BFF7E4FEB1C); }; + ADE6E539DB98A302483A82D0 = {isa = PBXProject; buildConfigurationList = 493C2C5E457692E5149C5525; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { DE12B7643D374BFF7E4FEB1C = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 65BEFC705A89E5C8A9E35C97; projectDirPath = ""; projectRoot = ""; targets = (DE12B7643D374BFF7E4FEB1C); }; }; rootObject = ADE6E539DB98A302483A82D0; } diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln index 79a4f1d5d9..112ebc28e0 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln @@ -1546,6 +1546,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1578,6 +1579,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln index 5c03bbb32e..f3852257fb 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln @@ -1546,6 +1546,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1578,6 +1579,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln index beeb937f2a..1a6e612b3f 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln @@ -1546,6 +1546,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1578,6 +1579,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index 63253c657d..fd62ce1c31 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/examples/audio plugin host/Plugin Host.jucer b/examples/audio plugin host/Plugin Host.jucer index dce34b8523..49911393b7 100644 --- a/examples/audio plugin host/Plugin Host.jucer +++ b/examples/audio plugin host/Plugin Host.jucer @@ -11,7 +11,7 @@ + osxSDK="default" osxCompatibility="10.5 SDK" osxArchitecture="default"/> diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 85bf882996..a8d1622b9c 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -1112,6 +1112,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" "../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" + "../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" "../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" "../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" @@ -1136,6 +1137,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" "../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" + "../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" "../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" "../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" "../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" @@ -2250,6 +2252,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/documents/juc set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AnimatedAppComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2274,6 +2277,7 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_a set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java index bc0560a43b..c40afed921 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java +++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java @@ -1965,8 +1965,8 @@ public class AudioPerformanceTest extends Activity { java.util.Locale locale = java.util.Locale.getDefault(); - return isRegion ? locale.getDisplayCountry (java.util.Locale.US) - : locale.getDisplayLanguage (java.util.Locale.US); + return isRegion ? locale.getCountry() + : locale.getLanguage(); } private static final String getFileLocation (String type) diff --git a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj index f6f2117413..c42f222401 100644 --- a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -584,6 +584,7 @@ 7AA31F3507B686BDB4E41B4D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_ObjCHelpers.h"; path = "../../../../modules/juce_core/native/juce_osx_ObjCHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 7AE4C43E62213262B7206511 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NormalisableRange.h"; path = "../../../../modules/juce_core/maths/juce_NormalisableRange.h"; sourceTree = "SOURCE_ROOT"; }; 7AFCEC7E562EE311B850BC99 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; }; + 7B6FA0F81021CDA9E25A5B87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 7BC782A4D0F3D38C462B9BE5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "floor_books.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/floor/floor_books.h"; sourceTree = "SOURCE_ROOT"; }; 7C072D2CD85FD979297B1E22 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XmlElement.cpp"; path = "../../../../modules/juce_core/xml/juce_XmlElement.cpp"; sourceTree = "SOURCE_ROOT"; }; 7C53B64BB95E75E3A7856299 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jconfig.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jconfig.h"; sourceTree = "SOURCE_ROOT"; }; @@ -909,6 +910,7 @@ C65DD3357A8A2E938BE34575 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "setup_8.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_8.h"; sourceTree = "SOURCE_ROOT"; }; C661316FE7DE42445E2C9C59 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "stream_encoder.h"; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_encoder.h"; sourceTree = "SOURCE_ROOT"; }; C6A10970DA4536CE1038393F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageManager.h"; path = "../../../../modules/juce_events/messages/juce_MessageManager.h"; sourceTree = "SOURCE_ROOT"; }; + C6FBDBBD3FF2057DB8902CE4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C6FE613D52823DC395882EDE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jquant1.c"; sourceTree = "SOURCE_ROOT"; }; C756ADD68C669D86798439FB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdmarker.c"; sourceTree = "SOURCE_ROOT"; }; C76AE0E7FB192383F4687B42 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Message.h"; path = "../../../../modules/juce_events/messages/juce_Message.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2452,7 +2454,8 @@ 4845721383ADD3550F6E660C = {isa = PBXGroup; children = ( 948915DF1F924C4541081A84, 0C07FE9302729E7CCB168477, - 30445F9D4C3E8B50A7FA9426, ); name = embedding; sourceTree = ""; }; + 30445F9D4C3E8B50A7FA9426, + C6FBDBBD3FF2057DB8902CE4, ); name = embedding; sourceTree = ""; }; 496EE37143F953E52D1AE99F = {isa = PBXGroup; children = ( 166432B08B32D28E0EE6CA2A, E0201712CDD6F238A571B01E, @@ -2479,6 +2482,7 @@ 41650B41C126475F54AAD41F, A984469FB49FE265EA571F70, C4F0EE576FCE049F7980BB92, + 7B6FA0F81021CDA9E25A5B87, 5CC6DDBE8F8CDD35006873D5, 948419EDC66FC6FE3CF9D34B, 717E6F679760C87003A61B3B, @@ -2674,7 +2678,7 @@ C86DD529EC94922C2AB61742, 6C2BE2DE2ECC96615ED827AB, 409D569C572B6EF7F4F1702D, ); buildRules = ( ); dependencies = ( ); name = "AudioPerformanceTest - App"; productName = AudioPerformanceTest; productReference = 614F2084407B35D62101F69F; productType = "com.apple.product-type.application"; }; - 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; + 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; }; rootObject = 9CE2A44801B5B4BE7A9667DA; } diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln index dd00f8505a..86579c650a 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln @@ -1511,6 +1511,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1543,6 +1544,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj index 25c4a50b64..d071dabd3f 100644 --- a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -586,6 +586,7 @@ 7AA31F3507B686BDB4E41B4D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_ObjCHelpers.h"; path = "../../../../modules/juce_core/native/juce_osx_ObjCHelpers.h"; sourceTree = "SOURCE_ROOT"; }; 7AE4C43E62213262B7206511 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NormalisableRange.h"; path = "../../../../modules/juce_core/maths/juce_NormalisableRange.h"; sourceTree = "SOURCE_ROOT"; }; 7AFCEC7E562EE311B850BC99 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; }; + 7B6FA0F81021CDA9E25A5B87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 7BC782A4D0F3D38C462B9BE5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "floor_books.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/floor/floor_books.h"; sourceTree = "SOURCE_ROOT"; }; 7C072D2CD85FD979297B1E22 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XmlElement.cpp"; path = "../../../../modules/juce_core/xml/juce_XmlElement.cpp"; sourceTree = "SOURCE_ROOT"; }; 7C53B64BB95E75E3A7856299 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jconfig.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jconfig.h"; sourceTree = "SOURCE_ROOT"; }; @@ -913,6 +914,7 @@ C65DD3357A8A2E938BE34575 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "setup_8.h"; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_8.h"; sourceTree = "SOURCE_ROOT"; }; C661316FE7DE42445E2C9C59 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "stream_encoder.h"; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_encoder.h"; sourceTree = "SOURCE_ROOT"; }; C6A10970DA4536CE1038393F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageManager.h"; path = "../../../../modules/juce_events/messages/juce_MessageManager.h"; sourceTree = "SOURCE_ROOT"; }; + C6FBDBBD3FF2057DB8902CE4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; C6FE613D52823DC395882EDE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jquant1.c"; sourceTree = "SOURCE_ROOT"; }; C756ADD68C669D86798439FB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdmarker.c"; sourceTree = "SOURCE_ROOT"; }; C76AE0E7FB192383F4687B42 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Message.h"; path = "../../../../modules/juce_events/messages/juce_Message.h"; sourceTree = "SOURCE_ROOT"; }; @@ -2456,7 +2458,8 @@ 4845721383ADD3550F6E660C = {isa = PBXGroup; children = ( 948915DF1F924C4541081A84, 0C07FE9302729E7CCB168477, - 30445F9D4C3E8B50A7FA9426, ); name = embedding; sourceTree = ""; }; + 30445F9D4C3E8B50A7FA9426, + C6FBDBBD3FF2057DB8902CE4, ); name = embedding; sourceTree = ""; }; 496EE37143F953E52D1AE99F = {isa = PBXGroup; children = ( 166432B08B32D28E0EE6CA2A, E0201712CDD6F238A571B01E, @@ -2483,6 +2486,7 @@ 41650B41C126475F54AAD41F, A984469FB49FE265EA571F70, C4F0EE576FCE049F7980BB92, + 7B6FA0F81021CDA9E25A5B87, 5CC6DDBE8F8CDD35006873D5, 948419EDC66FC6FE3CF9D34B, 717E6F679760C87003A61B3B, @@ -2688,7 +2692,7 @@ C86DD529EC94922C2AB61742, 6C2BE2DE2ECC96615ED827AB, 409D569C572B6EF7F4F1702D, ); buildRules = ( ); dependencies = ( ); name = "AudioPerformanceTest - App"; productName = AudioPerformanceTest; productReference = 614F2084407B35D62101F69F; productType = "com.apple.product-type.application"; }; - 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; + 9CE2A44801B5B4BE7A9667DA = {isa = PBXProject; buildConfigurationList = 7097CF6AC086DAC346ACCCD9; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { E9FD2656EC625C9C8DE30219 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3BA1BA0CAFE969E99950C06B; projectDirPath = ""; projectRoot = ""; targets = (E9FD2656EC625C9C8DE30219); }; }; rootObject = 9CE2A44801B5B4BE7A9667DA; } diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index 29bce453c7..94e501e537 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -200,10 +200,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index bfed04670b..10c8285e2e 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -558,6 +558,7 @@ 73B9F17FE55A02C2BB87E008 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_OpenGLComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_OpenGLComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; 73CEF8ADF016E554F96FD3B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CompilerSupport.h"; path = "../../../../modules/juce_core/system/juce_CompilerSupport.h"; sourceTree = "SOURCE_ROOT"; }; 7435199CD81F307322FE1065 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; }; + 74E24D506019C16ACD34D218 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; 74FB4B3E778EDD3DE2F8C23C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = "../../../../modules/juce_graphics/image_formats/pnglib/pngget.c"; sourceTree = "SOURCE_ROOT"; }; 7507846FD162469386479CDB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MenuBarModel.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.cpp"; sourceTree = "SOURCE_ROOT"; }; 7519822C13AE752FE0E71999 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdphuff.c"; sourceTree = "SOURCE_ROOT"; }; @@ -951,6 +952,7 @@ CF6C8BD0DA3D8CD4E99EBADA = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; CF8011B3C67B609032974DA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_NewCppFileTemplate.cpp"; path = "../../Source/BinaryData/jucer_NewCppFileTemplate.cpp"; sourceTree = "SOURCE_ROOT"; }; D00F311BFC3C2625C457CB9B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + D029F6B9C5A1661FABCBFAF3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D041043D3B554B88F855C174 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; }; D0D8B580D0689FFF4B9B823B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_StrokeType.h"; path = "../../Source/ComponentEditor/paintelements/jucer_StrokeType.h"; sourceTree = "SOURCE_ROOT"; }; D0F1614CC861E8E0B59B7A06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Messaging.cpp"; path = "../../../../modules/juce_events/native/juce_linux_Messaging.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -2306,7 +2308,8 @@ 4EF62D3D2047811C92E7EB02 = {isa = PBXGroup; children = ( A1C82396A9A0F9A296AA7E6B, 99DD90B64BC5CC5FF68FA0C5, - 86DADC3D8463C21DF2751EA6, ); name = embedding; sourceTree = ""; }; + 86DADC3D8463C21DF2751EA6, + 74E24D506019C16ACD34D218, ); name = embedding; sourceTree = ""; }; EC8CE06D9D8E52E49905136C = {isa = PBXGroup; children = ( 96440E5117350998ED0D84A5, 5012097FCF4A8A50AAFA3437, @@ -2333,6 +2336,7 @@ 58858190E0EE0AA6955EA236, 700C8F52226C6E8182EE7034, EC3FA55EC9F283E934054CA3, + D029F6B9C5A1661FABCBFAF3, D800DE818BEDBF4579D15B1D, 441A0EA83E44264CB977F21B, A3DB226F40C387078864E68A, @@ -2582,7 +2586,7 @@ C262D0F297DDE25326F5AC81, 5CB869A8DA78BE6FA2757034, D150288A32EE596408C2B99F, ); buildRules = ( ); dependencies = ( ); name = "Projucer - App"; productName = Projucer; productReference = 09DE066936CF037E9709ADB1; productType = "com.apple.product-type.application"; }; - 74EA481348A24104E6ACE009 = {isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; attributes = { LastUpgradeCheck = 0820; TargetAttributes = { 0039FE1A254FE518518BF8B8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = (0039FE1A254FE518518BF8B8); }; + 74EA481348A24104E6ACE009 = {isa = PBXProject; buildConfigurationList = F90407F24422C589DA251604; attributes = { LastUpgradeCheck = 0830; TargetAttributes = { 0039FE1A254FE518518BF8B8 = { SystemCapabilities = {com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; }; }; }; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 3CC531922CC2D398E283A845; projectDirPath = ""; projectRoot = ""; targets = (0039FE1A254FE518518BF8B8); }; }; rootObject = 74EA481348A24104E6ACE009; } diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln index f6a1060a0b..44c2f61584 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln @@ -1344,6 +1344,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1376,6 +1377,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln index 37d39f46ab..c05012396b 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln @@ -1344,6 +1344,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1376,6 +1377,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln index fe9c0c7268..7bcfb38bf6 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln @@ -1344,6 +1344,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1376,6 +1377,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h index 10bdafc0c0..bd240b76a3 100644 --- a/extras/Projucer/JuceLibraryCode/AppConfig.h +++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -112,10 +112,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index d99128d800..3021884ad7 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -1563,7 +1563,7 @@ static const unsigned char temp_binary_data_8[] = "\r\n" "const String FILTERCLASSNAME::getProgramName (int index)\r\n" "{\r\n" -" return String();\r\n" +" return {};\r\n" "}\r\n" "\r\n" "void FILTERCLASSNAME::changeProgramName (int index, const String& newName)\r\n" @@ -5239,7 +5239,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0xafccbd3f: numBytes = 3092; return jucer_AudioComponentTemplate_cpp; case 0x27c5a93a: numBytes = 1162; return jucer_AudioPluginEditorTemplate_cpp; case 0x4d0721bf: numBytes = 938; return jucer_AudioPluginEditorTemplate_h; - case 0x51b49ac5: numBytes = 5475; return jucer_AudioPluginFilterTemplate_cpp; + case 0x51b49ac5: numBytes = 5469; return jucer_AudioPluginFilterTemplate_cpp; case 0x488afa0a: numBytes = 2203; return jucer_AudioPluginFilterTemplate_h; case 0xabad7041: numBytes = 2151; return jucer_ComponentTemplate_cpp; case 0xfc72fe86: numBytes = 2064; return jucer_ComponentTemplate_h; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index 03f9371cba..52b16aa3a9 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -33,7 +33,7 @@ namespace BinaryData const int jucer_AudioPluginEditorTemplate_hSize = 938; extern const char* jucer_AudioPluginFilterTemplate_cpp; - const int jucer_AudioPluginFilterTemplate_cppSize = 5475; + const int jucer_AudioPluginFilterTemplate_cppSize = 5469; extern const char* jucer_AudioPluginFilterTemplate_h; const int jucer_AudioPluginFilterTemplate_hSize = 2203; diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index fa05803b91..1fa3d42922 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -898,6 +898,7 @@ BB1202BFAC430CB62A78E63E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; }; BB2CC079724044CBEC68D1B2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardState.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp"; sourceTree = "SOURCE_ROOT"; }; BB3A9DD17C4B752BC5C3AE02 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "stream_decoder.h"; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_decoder.h"; sourceTree = "SOURCE_ROOT"; }; + BC182013A3A195C4C14F3E2C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XEmbedComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_XEmbedComponent.h"; sourceTree = "SOURCE_ROOT"; }; BC40851115EBBE44982702B0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = endswap.h; path = "../../../../modules/juce_audio_formats/codecs/flac/endswap.h"; sourceTree = "SOURCE_ROOT"; }; BC658689F10CCF8E1847ABA3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.h"; sourceTree = "SOURCE_ROOT"; }; BC91AC2F5F929948EA4DED1C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadWithProgressWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h"; sourceTree = "SOURCE_ROOT"; }; @@ -989,6 +990,7 @@ D0063CF6E767B55FE5078D63 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = memory.h; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/private/memory.h"; sourceTree = "SOURCE_ROOT"; }; D0368021E3ADE399F6B18F62 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdphuff.c"; sourceTree = "SOURCE_ROOT"; }; D09628A1CC2F5D43B17CA473 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CachedComponentImage.h"; path = "../../../../modules/juce_gui_basics/components/juce_CachedComponentImage.h"; sourceTree = "SOURCE_ROOT"; }; + D0C5F893D627CF675AE4C3CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_XEmbedComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; D0D459BC748C9E077474CE99 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableCornerComponent.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h"; sourceTree = "SOURCE_ROOT"; }; D0D7C01D95C4259DAE32E722 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RSAKey.h"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.h"; sourceTree = "SOURCE_ROOT"; }; D0D94FCDE9A461A44F81D72A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_gui_basics.mm"; path = "../../../../modules/juce_gui_basics/juce_gui_basics.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -2480,7 +2482,8 @@ F7A472C3DA3CFF81EEA2BCB9 = {isa = PBXGroup; children = ( 200238375D55147DC98E25F0, 8A3CDD43812C610DA9BBACB0, - 00C5D011D05E276D93CAC42A, ); name = embedding; sourceTree = ""; }; + 00C5D011D05E276D93CAC42A, + BC182013A3A195C4C14F3E2C, ); name = embedding; sourceTree = ""; }; 63FD16A1B4C5CAE35F72E89C = {isa = PBXGroup; children = ( AAED8A25776EB53213A2AC8E, 81596391E40F15FCDEDAF320, @@ -2507,6 +2510,7 @@ DB9C5ADE1BB668E63563C264, 9A0A08A15D47D2F8556CA449, 9A0DC1C0EB29EB9097632781, + D0C5F893D627CF675AE4C3CE, E7B0A37EAEFF238743AABE4E, 6562FCA20B6E1D38DAAF88ED, E9A21F496D5DDC6CB7933A35, @@ -2801,7 +2805,7 @@ DD4C62A6EA1FD3497B42CDB0, E8585DDC9F9A0EE2FB82FA52, 136E27FD16209F9868093A6C, ); buildRules = ( ); dependencies = ( ); name = "UnitTestRunner - ConsoleApp"; productName = UnitTestRunner; productReference = 080EAB9CF5AB2BD6B2BBB173; productType = "com.apple.product-type.tool"; }; - E1E93F2B4B2D17E011395520 = {isa = PBXProject; buildConfigurationList = 18FC121B1014F7999CD135D3; attributes = { LastUpgradeCheck = 0820; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 99F3717D3FEAFDCA3C22E868; projectDirPath = ""; projectRoot = ""; targets = (B0D62ED1051EE9DFD49F6321); }; + E1E93F2B4B2D17E011395520 = {isa = PBXProject; buildConfigurationList = 18FC121B1014F7999CD135D3; attributes = { LastUpgradeCheck = 0830; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = 99F3717D3FEAFDCA3C22E868; projectDirPath = ""; projectRoot = ""; targets = (B0D62ED1051EE9DFD49F6321); }; }; rootObject = E1E93F2B4B2D17E011395520; } diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln index b28e0cdf90..63ebac56d3 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.sln @@ -1483,6 +1483,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1515,6 +1516,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index 0543dcbb35..3ccaa895e9 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -192,10 +192,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: diff --git a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj index b39e67323d..f51df078f5 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -648,7 +648,7 @@ 4F5C64675AD3AC67829798FF, A69CF4AD8F7015A8D3228FDE, 2722C90F3B5DAD661891FDF4, ); buildRules = ( ); dependencies = ( ); name = "BinaryBuilder - ConsoleApp"; productName = BinaryBuilder; productReference = 799073185F72F5FAD05253C3; productType = "com.apple.product-type.tool"; }; - 36B6F402BC83F21646259DEF = {isa = PBXProject; buildConfigurationList = E4C85B0464A93027D035AA1F; attributes = { LastUpgradeCheck = 0820; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C18D022743CF5BD14D6A6A9E; projectDirPath = ""; projectRoot = ""; targets = (80B70DE094998C267F152DD5); }; + 36B6F402BC83F21646259DEF = {isa = PBXProject; buildConfigurationList = E4C85B0464A93027D035AA1F; attributes = { LastUpgradeCheck = 0830; }; compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 0; mainGroup = C18D022743CF5BD14D6A6A9E; projectDirPath = ""; projectRoot = ""; targets = (80B70DE094998C267F152DD5); }; }; rootObject = 36B6F402BC83F21646259DEF; } diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln b/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln index a175b210a5..e744b91f20 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll.sln @@ -1535,6 +1535,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedding", "embedding", "{ ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h + ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h = ..\..\..\..\modules\juce_gui_extra\embedding\juce_XEmbedComponent.h EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{526A655D-3D6A-CABA-3206-9B8745975E38}" @@ -1567,6 +1568,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "native", "native", "{C0D38C ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_ios_UIViewComponent.mm ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_SystemTrayIcon.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_X11_WebBrowserComponent.cpp + ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp = ..\..\..\..\modules\juce_gui_extra\native\juce_linux_XEmbedComponent.cpp ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_AppleRemote.mm ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm = ..\..\..\..\modules\juce_gui_extra\native\juce_mac_NSViewComponent.mm diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index 5b701c7d7b..1f08091c94 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -203,10 +203,6 @@ //#define JUCE_USE_XCURSOR #endif -#ifndef JUCE_USE_WINDOWS_POINTER_API - //#define JUCE_USE_WINDOWS_POINTER_API -#endif - //============================================================================== // juce_gui_extra flags: