Bug 548491 - [regression][mac] Cheese in java editor

Change-Id: I32415326801837c10bc4fb6d7e18d832c20b3645

4 files changed, 10 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 47078eb055..7f87cf010a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -4125,6 +4125,9 @@
 		<method selector="lockFocus" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="lockFocusIfCanDraw" swt_gen="true">
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="menuForEvent:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
index 5f4f4d6614..0bbc4a31bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -214,6 +214,10 @@ public void lockFocus() {
 	OS.objc_msgSend(this.id, OS.sel_lockFocus);
 }
 
+public boolean lockFocusIfCanDraw() {
+	return OS.objc_msgSend_bool(this.id, OS.sel_lockFocusIfCanDraw);
+}
+
 public NSMenu menuForEvent(NSEvent event) {
 	long result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
 	return result != 0 ? new NSMenu(result) : null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 2e5314cd3d..20944400bc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -1587,6 +1587,7 @@ public static final long sel_location = Selector.sel_location.value;
 public static final long sel_locationForGlyphAtIndex_ = Selector.sel_locationForGlyphAtIndex_.value;
 public static final long sel_locationInWindow = Selector.sel_locationInWindow.value;
 public static final long sel_lockFocus = Selector.sel_lockFocus.value;
+public static final long sel_lockFocusIfCanDraw = Selector.sel_lockFocusIfCanDraw.value;
 public static final long sel_lowercaseString = Selector.sel_lowercaseString.value;
 public static final long sel_magnification = Selector.sel_magnification.value;
 public static final long sel_magnifyWithEvent_ = Selector.sel_magnifyWithEvent_.value;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java
index 058b4cf9fe..1313544873 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Selector.java
@@ -698,6 +698,7 @@ public enum Selector {
 	, sel_locationForGlyphAtIndex_("locationForGlyphAtIndex:")
 	, sel_locationInWindow("locationInWindow")
 	, sel_lockFocus("lockFocus")
+	, sel_lockFocusIfCanDraw("lockFocusIfCanDraw")
 	, sel_lowercaseString("lowercaseString")
 	, sel_magnification("magnification")
 	, sel_magnifyWithEvent_("magnifyWithEvent:")