summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/cocoa
diff options
context:
space:
mode:
authorCarolyn MacLeod <Carolyn_MacLeod@ca.ibm.com>2012-03-10 13:15:23 -0500
committerCarolyn MacLeod <Carolyn_MacLeod@ca.ibm.com>2012-03-10 16:42:25 -0500
commitd4768e1203a5077ab3bf6ed0bdc55f1be7dbe216 (patch)
tree4da48c39b0c2efe9635d40c0b258f751980a21f1 /bundles/org.eclipse.swt/Eclipse SWT/cocoa
parentcfe6ffcea1d99dc4b4ce3146d2ad4b9c767e7566 (diff)
downloadeclipse.platform.swt-d4768e1203a5077ab3bf6ed0bdc55f1be7dbe216.tar.gz
eclipse.platform.swt-d4768e1203a5077ab3bf6ed0bdc55f1be7dbe216.tar.xz
eclipse.platform.swt-d4768e1203a5077ab3bf6ed0bdc55f1be7dbe216.zip
Mac VoiceOver calls menuForEvent. Fix CCombo.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/cocoa')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index b778e836ea..3b3685417a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -2418,7 +2418,8 @@ int /*long*/ menuForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEv
Event event = new Event ();
event.x = x;
event.y = y;
- event.detail = SWT.MENU_MOUSE;
+ NSEvent nsEvent = new NSEvent(theEvent);
+ event.detail = nsEvent.buttonNumber() > 0 ? SWT.MENU_MOUSE : SWT.MENU_KEYBOARD;
sendEvent (SWT.MenuDetect, event);
//widget could be disposed at this point
if (isDisposed ()) return 0;