From 9712775e5bb634b0fa4dd4c9e53dac4626a28d41 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 19 Jul 2022 14:04:09 +0100 Subject: [PATCH] macOS: Remove macOS 10.12 preprocessor checks The current minimum-supported Xcode (10.1) includes the macOS 10.14.1 SDK, so APIs from macOS 10.12 will always be available. --- .../AU/juce_AU_Wrapper.mm | 2 - .../format_types/juce_AudioUnitPluginFormat.h | 9 ---- .../native/juce_BasicNativeHeaders.h | 46 ------------------- .../native/juce_mac_NSViewComponentPeer.mm | 8 ---- .../native/juce_mac_SystemTrayIcon.cpp | 4 -- .../native/juce_mac_WebBrowserComponent.mm | 12 +---- modules/juce_opengl/native/juce_OpenGL_osx.h | 6 +-- 7 files changed, 4 insertions(+), 83 deletions(-) diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm index fff199ba47..f769437035 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm @@ -693,7 +693,6 @@ public: return noErr; } - #if defined (MAC_OS_X_VERSION_10_12) case kAudioUnitProperty_AUHostIdentifier: { if (inDataSize < sizeof (AUHostVersionIdentifier)) @@ -704,7 +703,6 @@ public: return noErr; } - #endif default: break; } diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h index 53c5048765..162484190f 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h @@ -67,13 +67,4 @@ private: #endif -//============================================================================== -#if (! defined (MAC_OS_X_VERSION_10_12)) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12) -enum -{ - /** Custom AudioUnit property used to indicate MPE support */ - kAudioUnitProperty_SupportsMPE = 58 -}; -#endif - } diff --git a/modules/juce_core/native/juce_BasicNativeHeaders.h b/modules/juce_core/native/juce_BasicNativeHeaders.h index fa8486b809..ed5ed459a8 100644 --- a/modules/juce_core/native/juce_BasicNativeHeaders.h +++ b/modules/juce_core/native/juce_BasicNativeHeaders.h @@ -46,52 +46,6 @@ #endif #import - #if (! defined MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 - #define NSEventModifierFlagCommand NSCommandKeyMask - #define NSEventModifierFlagControl NSControlKeyMask - #define NSEventModifierFlagHelp NSHelpKeyMask - #define NSEventModifierFlagNumericPad NSNumericPadKeyMask - #define NSEventModifierFlagOption NSAlternateKeyMask - #define NSEventModifierFlagShift NSShiftKeyMask - #define NSCompositingOperationSourceOver NSCompositeSourceOver - #define NSEventMaskApplicationDefined NSApplicationDefinedMask - #define NSEventTypeApplicationDefined NSApplicationDefined - #define NSEventTypeCursorUpdate NSCursorUpdate - #define NSEventTypeMouseMoved NSMouseMoved - #define NSEventTypeLeftMouseDown NSLeftMouseDown - #define NSEventTypeRightMouseDown NSRightMouseDown - #define NSEventTypeOtherMouseDown NSOtherMouseDown - #define NSEventTypeLeftMouseUp NSLeftMouseUp - #define NSEventTypeRightMouseUp NSRightMouseUp - #define NSEventTypeOtherMouseUp NSOtherMouseUp - #define NSEventTypeLeftMouseDragged NSLeftMouseDragged - #define NSEventTypeRightMouseDragged NSRightMouseDragged - #define NSEventTypeOtherMouseDragged NSOtherMouseDragged - #define NSEventTypeScrollWheel NSScrollWheel - #define NSEventTypeKeyDown NSKeyDown - #define NSEventTypeKeyUp NSKeyUp - #define NSEventTypeFlagsChanged NSFlagsChanged - #define NSEventMaskAny NSAnyEventMask - #define NSWindowStyleMaskBorderless NSBorderlessWindowMask - #define NSWindowStyleMaskClosable NSClosableWindowMask - #define NSWindowStyleMaskFullScreen NSFullScreenWindowMask - #define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask - #define NSWindowStyleMaskResizable NSResizableWindowMask - #define NSWindowStyleMaskTitled NSTitledWindowMask - #define NSAlertStyleCritical NSCriticalAlertStyle - #define NSControlSizeRegular NSRegularControlSize - #define NSEventTypeMouseEntered NSMouseEntered - #define NSEventTypeMouseExited NSMouseExited - #define NSAlertStyleInformational NSInformationalAlertStyle - #define NSEventTypeTabletPoint NSTabletPoint - #define NSEventTypeTabletProximity NSTabletProximity - #define NSEventTypeFlagsChanged NSFlagsChanged - #define NSEventTypeAppKitDefined NSAppKitDefined - #define NSEventTypeSystemDefined NSSystemDefined - #define NSEventTypeApplicationDefined NSApplicationDefined - #define NSEventTypePeriodic NSPeriodic - #define NSEventTypeSmartMagnify NSEventTypeSmartMagnify - #endif #import #include #endif diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index 75cc86eba5..df3f46517b 100644 --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -215,10 +215,8 @@ public: [window setRestorable: NO]; - #if defined (MAC_OS_X_VERSION_10_12) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12) if (@available (macOS 10.12, *)) [window setTabbingMode: NSWindowTabbingModeDisallowed]; - #endif scopedObservers.emplace_back (view, frameChangedSelector, NSWindowDidMoveNotification, window); scopedObservers.emplace_back (view, frameChangedSelector, NSWindowDidMiniaturizeNotification, window); @@ -1731,15 +1729,11 @@ private: #if JUCE_64BIT case NSEventTypeSmartMagnify: case NSEventTypePressure: - #endif - #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 - #if JUCE_64BIT case NSEventTypeDirectTouch: #endif #if defined (MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 case NSEventTypeChangeMode: #endif - #endif default: return false; } @@ -1995,13 +1989,11 @@ struct JuceNSViewClass : public NSViewComponentPeerWrapper> { // Without setting contentsFormat macOS Big Sur will always set the invalid area // to be the entire frame. - #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 if (@available (macOS 10.12, *)) { CALayer* layer = ((NSView*) self).layer; layer.contentsFormat = kCAContentsFormatRGBA8Uint; } - #endif sendSuperclassMessage (self, @selector (viewWillDraw)); }); diff --git a/modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp b/modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp index fb90508f28..a59b332902 100644 --- a/modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp +++ b/modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp @@ -105,11 +105,7 @@ struct API_AVAILABLE (macos (10.10)) ButtonBasedStatusItem : public StatusItemCo button.image = statusIcon.get(); button.target = eventForwarder.get(); button.action = @selector (handleEvent:); - #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 [button sendActionOn: NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown | NSEventMaskScrollWheel]; - #else - [button sendActionOn: NSLeftMouseDownMask | NSRightMouseDownMask | NSScrollWheelMask]; - #endif } ~ButtonBasedStatusItem() override diff --git a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm index 6f4c5b20b2..a7618179f3 100644 --- a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm +++ b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm @@ -26,10 +26,6 @@ namespace juce { -#if JUCE_MAC && defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 - #define WKWEBVIEW_OPENPANEL_SUPPORTED 1 -#endif - static NSURL* appendParametersToFileURL (const URL& url, NSURL* fileUrl) { if (@available (macOS 10.10, *)) @@ -128,10 +124,8 @@ private: { const auto modifierFlags = [event modifierFlags]; - #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 if (@available (macOS 10.12, *)) return (modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagCommand; - #endif JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations") return (modifierFlags & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask; @@ -277,10 +271,10 @@ struct API_AVAILABLE (macos (10.10)) WebViewDelegateClass : public ObjCClass*)) @@ -402,7 +395,6 @@ private: delete wrapper; }); } - #endif }; //============================================================================== diff --git a/modules/juce_opengl/native/juce_OpenGL_osx.h b/modules/juce_opengl/native/juce_OpenGL_osx.h index aceff12f41..f3c21b929e 100644 --- a/modules/juce_opengl/native/juce_OpenGL_osx.h +++ b/modules/juce_opengl/native/juce_OpenGL_osx.h @@ -246,10 +246,8 @@ public: static NSOpenGLContextParameter getSwapIntervalParameter() { - #if defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 - if (@available (macOS 10.12, *)) - return NSOpenGLContextParameterSwapInterval; - #endif + if (@available (macOS 10.12, *)) + return NSOpenGLContextParameterSwapInterval; return NSOpenGLCPSwapInterval; }