From 02c5ad29dba3bf8b4a24cdd22b5d51751999398e Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 25 May 2021 11:46:32 +0100 Subject: [PATCH] macOS: Disable accessibility on deployment targets < 10.10 --- .../accessibility/juce_AccessibilityHandler.cpp | 5 ++++- .../native/accessibility/juce_mac_Accessibility.mm | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp index 4329e26850..660c8d7c98 100644 --- a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp +++ b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp @@ -324,7 +324,9 @@ void AccessibilityHandler::takeFocus() } //============================================================================== -#if ! (JUCE_MAC || (JUCE_WINDOWS && ! JUCE_MINGW)) +#if ! ((JUCE_MAC && (defined (MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10)) \ + || (JUCE_WINDOWS && ! JUCE_MINGW)) + class AccessibilityHandler::AccessibilityNativeImpl { public: AccessibilityNativeImpl (AccessibilityHandler&) {} }; void AccessibilityHandler::notifyAccessibilityEvent (AccessibilityEvent) const {} void AccessibilityHandler::postAnnouncement (const String&, AnnouncementPriority) {} @@ -332,6 +334,7 @@ AccessibilityNativeHandle* AccessibilityHandler::getNativeImplementation() const AccessibilityHandler::AccessibilityNativeImpl* AccessibilityHandler::createNativeImpl (AccessibilityHandler&) { return nullptr; } void AccessibilityHandler::DestroyNativeImpl::operator() (AccessibilityHandler::AccessibilityNativeImpl*) const noexcept {} void notifyAccessibilityEventInternal (const AccessibilityHandler&, InternalAccessibilityEvent) {} + #endif } // namespace juce 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 9bd38e7891..cf62e49672 100644 --- a/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm +++ b/modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm @@ -26,6 +26,8 @@ namespace juce { +#if (defined (MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10) + #if (! defined MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 using NSAccessibilityRole = NSString*; using NSAccessibilityNotificationName = NSString*; @@ -1141,4 +1143,6 @@ void AccessibilityHandler::DestroyNativeImpl::operator() (AccessibilityHandler:: delete impl; } +#endif + } // namespace juce