Changeset 86 for trunk/src

Timestamp:

May 31, 2008, 12:42:05 AM (17 years ago)

Author:

lpino

Message:

(Control.java) - Varios fixes and changes to make pop ups work

File:

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

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

@@ -3 +3 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2004 EclipseOS2 Team.
+ * Copyright (c) 2002, 2008 EclipseOS2 Team.
  */
 
@@ -472 +472 @@
 
 //@@TODO (dmik): debug code, remove when no more necessary 
-//System.out.println (
-//    "Control.createHandle(): Window has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
-//    "    class = " + windowClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetStyle())
-//);
+System.out.println (
+    "Control.createHandle(): Window has been created:\n" +
+    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
+    "    class = " + windowClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetStyle())
+);
 
 //@@TODO(dmik): DBCS handling?
@@ -2320 +2320 @@
  * </ul>
  */
-//@@TODO(dmik)
+
 public void setMenu (Menu menu) {
     checkWidget ();
@@ -2949 +2949 @@
         case OS.WM_COMMAND: result = WM_COMMAND (mp1, mp2); break;
 //@@TODO (dmik): later
-//        case OS.WM_CONTEXTMENU: result = WM_CONTEXTMENU (wParam, lParam); break;
+        case OS.WM_CONTEXTMENU: result = WM_CONTEXTMENU (mp1, mp2); break;
         case OS.WM_CONTROL: result = WM_CONTROL (mp1, mp2); break;
 //@@TODO (dmik): later        
@@ -2969 +2969 @@
 //        case OS.WM_IME_CHAR: result = WM_IME_CHAR (wParam, lParam); break;
 //        case OS.WM_IME_COMPOSITION: result = WM_IME_COMPOSITION (wParam, lParam); break;
-//        case OS.WM_INITMENUPOPUP: result = WM_INITMENUPOPUP (wParam, lParam); break;
+        case OS.WM_INITMENU: result = WM_INITMENU (mp1, mp2); break;
 //        case OS.WM_GETFONT: result = WM_GETFONT (wParam, lParam); break;
 //        case OS.WM_GETOBJECT: result = WM_GETOBJECT (wParam, lParam); break;
@@ -2982 +2982 @@
         case OS.WM_MEASUREITEM: result = WM_MEASUREITEM (mp1, mp2); break;
 //        case OS.WM_MENUCHAR: result = WM_MENUCHAR (wParam, lParam); break;
-//        case OS.WM_MENUSELECT: result = WM_MENUSELECT (wParam, lParam); break;
+        case OS.WM_MENUEND: result = WM_MENUEND (mp1, mp2); break;
+        case OS.WM_MENUSELECT: result = WM_MENUSELECT (mp1, mp2); break;
 //        case OS.WM_MOUSEACTIVATE: result = WM_MOUSEACTIVATE (wParam, lParam); break;
 //        case OS.WM_MOUSEHOVER: result = WM_MOUSEHOVER (wParam, lParam); break;
@@ -3035 +3036 @@
     boolean keyUp = (OS.SHORT1FROMMP (mp1) & OS.KC_KEYUP) != 0;
 //@@TODO (dmik): debug, remove    
-//System.out.println("WM_CHAR ("+this+"): vk="+OS.SHORT2FROMMP (mp2)+" keyup="+keyUp);
+System.out.println("WM_CHAR ("+this+"): vk="+OS.SHORT2FROMMP (mp2)+" keyup="+keyUp);
     sendKeyEvent (keyUp ? SWT.KeyUp : SWT.KeyDown, OS.WM_CHAR, mp1, mp2);
     return null;
@@ -3087 +3088 @@
 }
 
-////@@TODO (dmik): later
-//LRESULT WM_CONTEXTMENU (int wParam, int lParam) {
-//      /*
-//      * Because context menus can be shared between controls
-//      * and the parent of all menus is the shell, the menu may
-//      * have been destroyed but not removed from the control.
-//      */
-//      if (wParam != handle) return null;
+MRESULT WM_CONTEXTMENU (int mp1, int mp2) {
+      /*
+      * Because context menus can be shared between controls
+      * and the parent of all menus is the shell, the menu may
+      * have been destroyed but not removed from the control.
+      */
+//      if (mp2 != handle) return null;
+    //@@TODO(lpino) Remove debug msg
+//      System.out.println("Control:WM_CONTEXTMENU - HANDLE = " + Integer.toHexString (handle));
+      short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_MOUSEBUTTON1DOWN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
+      boolean rc = OS.WinPopupMenu(handle, handle, menu.handle, 0, OS.SHORT1FROMMP(mp1), OS.SHORT2FROMMP(mp1), flOptions);
 //      if (menu != null && !menu.isDisposed ()) {
 //              menu.setVisible (true);
-//              return LRESULT.ZERO;
+//              return MRESULT.ZERO;
 //      }
-//      return null;
-//}
+      return MRESULT.TRUE;
+}
 
 MRESULT WM_CONTROL (int mp1, int mp2) {
@@ -3227 +3231 @@
 //}
 //
-//LRESULT WM_INITMENUPOPUP (int wParam, int lParam) {
-//
-//      /* Ignore WM_INITMENUPOPUP for an accelerator */
-//      Display display = getDisplay ();
-//      if (display.accelKeyHit) return null;
-//
+MRESULT WM_INITMENU (int mp1, int mp2) {
+
+      /* Ignore WM_INITMENU for an accelerator */
+      Display display = getDisplay ();
+      if (display.accelKeyHit) return null;
+      System.out.println("Control:WM_INITMENU " + OS.WinIsWindowVisible(mp2));
 //      /*
 //      * If the high order word of LPARAM is non-zero,
@@ -3301 +3305 @@
 //              // widget could be disposed at this point
 //      }
-//      return null;
-//}
+      return null;
+}
 
 //@@TODO (dmik): later
@@ -3461 +3465 @@
 //}
 //
-//LRESULT WM_MENUSELECT (int wParam, int lParam) {
+MRESULT WM_MENUSELECT (int mp1, int mp2) {
+    System.out.println("Control:WM_MENUSELECT");
 //      int code = wParam >> 16;
 //      Shell shell = getShell ();
@@ -3543 +3548 @@
 //              if (item != null) item.sendEvent (SWT.Arm);
 //      }
-//      return null;
-//}
+      return null;
+}
 //
 //LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) {
@@ -3798 +3803 @@
     
     return MRESULT.ZERO;
+}
+
+MRESULT WM_MENUEND (int mp1, int mp2) {
+    System.out.println("Control:WM_MENUEND");
+      return null;
 }