diff --git a/modules/juce_core/native/juce_mac_SystemStats.mm b/modules/juce_core/native/juce_mac_SystemStats.mm index f3b25cad00..077cce685d 100644 --- a/modules/juce_core/native/juce_mac_SystemStats.mm +++ b/modules/juce_core/native/juce_mac_SystemStats.mm @@ -95,14 +95,12 @@ static String getOSXVersion() { const String systemVersionPlist ("/System/Library/CoreServices/SystemVersion.plist"); - #if defined (MAC_OS_X_VERSION_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 if (@available (macOS 10.13, *)) { NSError* error = nullptr; return [NSDictionary dictionaryWithContentsOfURL: createNSURLFromFile (systemVersionPlist) error: &error]; } - #endif return [NSDictionary dictionaryWithContentsOfFile: juceStringToNS (systemVersionPlist)]; }(); diff --git a/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm b/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm index 3e08cb384c..d7d62d9431 100644 --- a/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm +++ b/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm @@ -29,11 +29,6 @@ static void juceFreeAccessibilityPlatformSpecificData (NSAccessibilityElement= MAC_OS_X_VERSION_10_13 addMethod (@selector (accessibilityChildrenInNavigationOrder), getAccessibilityChildren); - #endif registerClass(); } diff --git a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm index 38f89b7825..bb80f61b45 100644 --- a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm +++ b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm @@ -293,11 +293,7 @@ public: [item setTag: topLevelIndex]; [item setEnabled: i.isEnabled]; - #if defined (MAC_OS_X_VERSION_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 [item setState: i.isTicked ? NSControlStateValueOn : NSControlStateValueOff]; - #else - [item setState: i.isTicked ? NSOnState : NSOffState]; - #endif [item setTarget: (id) callback]; auto* juceItem = new PopupMenu::Item (i); diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index df3f46517b..a075cccc7d 100644 --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -1436,10 +1436,8 @@ public: { const auto type = [] { - #if defined (MAC_OS_X_VERSION_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 if (@available (macOS 10.13, *)) return NSPasteboardTypeFileURL; - #endif JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations") return (NSString*) kUTTypeFileURL; diff --git a/modules/juce_video/native/juce_mac_CameraDevice.h b/modules/juce_video/native/juce_mac_CameraDevice.h index dbbcca6606..28748f8de2 100644 --- a/modules/juce_video/native/juce_mac_CameraDevice.h +++ b/modules/juce_video/native/juce_mac_CameraDevice.h @@ -341,10 +341,8 @@ private: const auto codecType = [] { - #if defined (MAC_OS_X_VERSION_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 if (@available (macOS 10.13, *)) return AVVideoCodecTypeJPEG; - #endif return AVVideoCodecJPEG; }();