diff options
| author | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2012-03-09 17:40:50 -0500 |
|---|---|---|
| committer | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2012-03-10 16:42:22 -0500 |
| commit | cfe6ffcea1d99dc4b4ce3146d2ad4b9c767e7566 (patch) | |
| tree | 305c1dd0a5824e057727398333cf78d484a9c3ab /bundles/org.eclipse.swt/Eclipse SWT/cocoa | |
| parent | 43e07e7c95cb3522a72787415e72350f2cd8a6da (diff) | |
| download | eclipse.platform.swt-cfe6ffcea1d99dc4b4ce3146d2ad4b9c767e7566.tar.gz eclipse.platform.swt-cfe6ffcea1d99dc4b4ce3146d2ad4b9c767e7566.tar.xz eclipse.platform.swt-cfe6ffcea1d99dc4b4ce3146d2ad4b9c767e7566.zip | |
bug 110005 Mac
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.java | 1 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java | 1 |
2 files changed, 2 insertions, 0 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 26c7ba8b84..b778e836ea 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,6 +2418,7 @@ 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; sendEvent (SWT.MenuDetect, event); //widget could be disposed at this point if (isDisposed ()) return 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java index adffc449f9..dfe3a59bd5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java @@ -270,6 +270,7 @@ void _setVisible (boolean visible) { } else { location = window.mouseLocationOutsideOfEventStream(); } + hasLocation = false; // Hold on to window in case it is disposed while the popup is open. window.retain(); |