From e703654f7548ea0f22a721a6c3ceea9def45ec97 Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 28 Jul 2015 12:02:23 +0100 Subject: [PATCH] Allow user to force-include Carbon even on 64-bit if JUCE_SUPPORT_CARBON is set This is needed to include non-Carbon APIs such as TextInputServices for which there are no Cocoa replacements and are known to not be deprecated anytime soon. --- modules/juce_gui_basics/juce_gui_basics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 00eea12978..8f240494e8 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -49,7 +49,7 @@ #import #import - #if JUCE_SUPPORT_CARBON && ! (defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) + #if JUCE_SUPPORT_CARBON #define Point CarbonDummyPointName #define Component CarbonDummyCompName #import // still needed for SetSystemUIMode()