Changeset 176 for trunk/src/plugins

Timestamp:

Aug 3, 2009, 3:40:07 AM (16 years ago)

Author:

lpino

Message:

• Fix context menu

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java (modified) (1 diff)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java

@@ -3102 +3102 @@
       * have been destroyed but not removed from the control.
       */
-    //@@TODO(lpino) First check if this validation applies to OS/2 implementation and then validate using the coordinates of the mouse
+    //@@TODO(lpino) Validate using the coordinates of the mouse
 //      if (mp2 != handle) return null;
-      short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
-      boolean rc = OS.WinPopupMenu(handle, handle, menu.handle, OS.SHORT1FROMMP(mp1), OS.SHORT2FROMMP(mp1), 0, flOptions);
-      return MRESULT.TRUE;
+      if(menu == null) return MRESULT.FALSE;
+      else{
+          short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
+          boolean rc = OS.WinPopupMenu(handle, handle, menu.handle, OS.SHORT1FROMMP(mp1), OS.SHORT2FROMMP(mp1), 0, flOptions);
+          return MRESULT.TRUE;
+      }
 }