Browse Source

macOS: Disable accessibility on deployment targets < 10.10

v6.1.6
ed 4 years ago
parent
commit
02c5ad29db
2 changed files with 8 additions and 1 deletions
  1. +4
    -1
      modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
  2. +4
    -0
      modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm

+ 4
- 1
modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp View File

@@ -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

+ 4
- 0
modules/juce_gui_basics/native/accessibility/juce_mac_Accessibility.mm View File

@@ -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

Loading…
Cancel
Save