From 50f3572d8f0e2a2df0a1dc3ab721ee4bdf89b4a9 Mon Sep 17 00:00:00 2001
From: Chinh Nguyen <unknown>
Date: Sat, 25 Feb 2017 09:13:40 +1100
Subject: Bug [#1915]. Fix crash on OS X 10.9 due to accessibility API not
 available.

---
 cocoa/ScintillaView.mm    | 18 +++++++++++-------
 doc/ScintillaHistory.html |  4 ++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index cdb71ae55..fb299d947 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -79,7 +79,8 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
       [currentCursors addObject: [reverseArrowCursor retain]];
     }
     [self setClientView:[aScrollView documentView]];
-    self.accessibilityLabel = @"Scintilla Margin";
+    if ([self respondsToSelector: @selector(setAccessibilityLabel:)])
+       self.accessibilityLabel = @"Scintilla Margin";
   }
   return self;
 }
@@ -225,12 +226,15 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
                                    NSStringPboardType, ScintillaRecPboardType, NSFilenamesPboardType, nil]];
 
     // Set up accessibility in the text role
-    self.accessibilityElement = TRUE;
-    self.accessibilityEnabled = TRUE;
-    self.accessibilityLabel = NSLocalizedString(@"Scintilla", nil);	// No real localization
-    self.accessibilityRoleDescription = @"source code editor";
-    self.accessibilityRole = NSAccessibilityTextAreaRole;
-    self.accessibilityIdentifier = @"Scintilla";
+    if ([self respondsToSelector: @selector(setAccessibilityElement:)])
+    {
+       self.accessibilityElement = TRUE;
+       self.accessibilityEnabled = TRUE;
+       self.accessibilityLabel = NSLocalizedString(@"Scintilla", nil);	// No real localization
+       self.accessibilityRoleDescription = @"source code editor";
+       self.accessibilityRole = NSAccessibilityTextAreaRole;
+       self.accessibilityIdentifier = @"Scintilla";
+    }
   }
 
   return self;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8ddce8c7b..35bad2ece 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -531,6 +531,10 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1905/">Bug #1905</a>.
 	</li>
 	<li>
+	Fix crash on Cocoa with OS X 10.9 due to accessibility API not available.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1915/">Bug #1915</a>.
+	</li>
+	<li>
 	Fix to prevent double scrolling on GTK+ with X11.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
 	</li>
-- 
cgit v1.2.3