Changeset 98 for trunk/src

Timestamp:

Jun 12, 2008, 5:10:02 PM (17 years ago)

Author:

lpino

Message:

• Sync with SmartSVN

Location:

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

Files:

• Control.java (modified) (7 diffs)
• Decorations.java (modified) (2 diffs)
• Menu.java (modified) (1 diff)
• Shell.java (modified) (2 diffs)

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

@@ -2942 +2942 @@
     MRESULT result = null;
     switch (msg) {
+//        case OS.WM_ADJUSTWINDOWPOS: result = WM_ADJUSTWINDOWPOS (mp1, mp2); break;
         case OS.WM_CALCVALIDRECTS: result = WM_CALCVALIDRECTS (mp1, mp2); break;
         case OS.WM_CHAR: result = WM_CHAR (mp1, mp2); break;
@@ -3072 +3073 @@
     switch (OS.SHORT1FROMMP (mp2)) {
         //@@TODO(dmik)
-        //case OS.CMDSRC_MENU:
+        case OS.CMDSRC_MENU:
+            System.out.println("Control:WM_COMMAND - CMDSRC_MENU");
+            break;
         //    return null;
+        case OS.CMDSRC_ACCELERATOR:
+            System.out.println("Control:WM_COMMAND - CMDSRC_ACCELERATOR");
+            break;
         case OS.CMDSRC_PUSHBUTTON:
         //@@TODO(lpino)
@@ -3080 +3086 @@
         case OS.CMDSRC_COLORDLG:
         //case OS.CMDSRC_PRINTDLG:
-            int hwndChild = OS.WinWindowFromID (handle, OS.SHORT1FROMMP (mp1));
-            Control control = WidgetTable.get (hwndChild);
-            if (control == null) return null;
-            return control.wmCommandChild (mp1, mp2);
-    }
-    return null;
+    }
+    System.out.println("Control:WM_COMMAND - Calling wmCommandChild");
+    int hwndChild = OS.WinWindowFromID (handle, OS.SHORT1FROMMP (mp1));
+    Control control = WidgetTable.get (hwndChild);
+    System.out.println("Control:WM_COMMAND - Control handle = " + Integer.toHexString (handle));
+    System.out.println("Control:WM_COMMAND - Child handle = " + Integer.toHexString (hwndChild));
+//    System.out.println("Control:WM_COMMAND - Menu handle = " + Integer.toHexString (menu.handle));
+    if (control == null) return null;
+    return control.wmCommandChild (mp1, mp2);
+
+//    return null;
 }
 
@@ -3095 +3106 @@
       */
 //      if (mp2 != handle) return null;
+      boolean bIsWaiting = true;
+      System.out.println("Control:WM_CONTEXTMENU - PARENT HANDLE = " + Integer.toHexString (handle));
+      int hab = parent.getDisplay ().hab;
     //@@TODO(lpino) Remove debug msg
-//      System.out.println("Control:WM_CONTEXTMENU - HANDLE = " + Integer.toHexString (handle));
+      System.out.println("Control:WM_CONTEXTMENU - MENU HANDLE = " + Integer.toHexString (menu.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 MRESULT.ZERO;
 //      }
+//       while(bIsWaiting){        
+//            QMSG qmsg = new QMSG ();
+//
+//            OS.WinGetMsg(hab,qmsg, 0, 0, 0);
+//            if (qmsg.msg == OS.WM_COMMAND)
+//                bIsWaiting = false;
+//            OS.WinDispatchMsg(hab, qmsg);
+//          System.out.println("Control:WM_CONTEXTMENU");
+//        }
+      System.out.println("Control:WM_CONTEXTMENU - ABOUT TO RETURN" );
       return MRESULT.TRUE;
 }
@@ -3230 +3253 @@
 //      return null;
 //}
-//
+
 MRESULT WM_INITMENU (int mp1, int mp2) {
 
       /* Ignore WM_INITMENU for an accelerator */
+      System.out.println("Control:WM_INITMENU " + OS.WinIsWindowVisible(mp2));
       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,
@@ -3806 +3829 @@
 
 MRESULT WM_MENUEND (int mp1, int mp2) {
-    System.out.println("Control:WM_MENUEND");
+    System.out.println("Control:WM_MENUEND - HANDLE = " + Integer.toHexString (mp2));
       return null;
 }
@@ -4016 +4039 @@
 }
 
+//MRESULT WM_ADJUSTWINDOWPOS (int mp1, int mp2) {
+//    System.out.println("Control:WM_ADJUSTWINDOWPOS");
+//    SWP swp = new SWP ();
+//    OS.objcpy (swp, mp1);
+//    if ((swp.fl & OS.SWP_MINIMIZE) != 0) {
+//              sendEvent (SWT.Iconify);
+//              // widget could be disposed at this point
+//      } else if ((swp.fl & OS.SWP_RESTORE) != 0 && getMinimized ()) {
+//        sendEvent (SWT.Deiconify);
+//        // widget could be disposed at this point
+//    }
+//      return null;
+//}
+
 //@@TODO(dmik): seems we don't need it (presparams replace this)
 //LRESULT wmColorChild (int wParam, int lParam) {

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

@@ -393 +393 @@
     if (frameHandle == 0) error (SWT.ERROR_NO_HANDLES);
 //@@TODO (dmik): debug code, remove when no more necessary 
-//System.out.println (
-//    "Decorations.createHandle(): WC_FRAME has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (frameHandle) + "\n" +
-//    "    hwnd.parent = " + Integer.toHexString (hwndParent) + "\n" +
-//    "    hwnd.owner = " + Integer.toHexString (hwndOwner) + "\n" +
-//    "    class = " + windowFrameClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetFrameStyle())
-//);
+System.out.println (
+    "Decorations.createHandle(): WC_FRAME has been created:\n" +
+    "    hwnd = " + Integer.toHexString (frameHandle) + "\n" +
+    "    hwnd.parent = " + Integer.toHexString (hwndParent) + "\n" +
+    "    hwnd.owner = " + Integer.toHexString (hwndOwner) + "\n" +
+    "    class = " + windowFrameClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetFrameStyle())
+);
     FRAMECDATA fcdata = new FRAMECDATA ();
     fcdata.flCreateFlags = widgetFrameFlags ();
@@ -423 +423 @@
     state |= CANVAS;
 //@@TODO (dmik): debug code, remove when no more necessary 
-//System.out.println (
-//    "Decorations.createHandle(): FID_CLIENT window has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (frameHandle) + "\n" +
-//    "    class = " + windowClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetStyle())
-//);
+System.out.println (
+    "Decorations.createHandle(): FID_CLIENT window has been created:\n" +
+    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (frameHandle) + "\n" +
+    "    class = " + windowClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetStyle())
+);
 //@@TODO(dmik): do something for MDI windows if needed    
 //    if (parent == null) return;

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

@@ -885 +885 @@
 //      }
 }
-
-}
+}

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

@@ -1119 +1119 @@
 //}
 
-//@@TODO (dmik): later
-//LRESULT WM_COMMAND (int wParam, int lParam) {
-//      if (OS.IsPPC) {
-//              /*
-//              * Note in WinCE PPC:  Close the Shell when the "Done Button" has
-//              * been pressed. lParam is either 0 (PocketPC 2002) or the handle
-//              * to the Shell (PocketPC).
-//              */
-//              int loWord = wParam & 0xFFFF;
-//              if (loWord == OS.IDOK && (lParam == 0 || lParam == handle)) {
-//                      OS.PostMessage (handle, OS.WM_CLOSE, 0, 0);
-//                      return LRESULT.ZERO;                    
-//              }
-//              /* 
-//              * Note in WinCE PPC.  menu events originate from the
-//              * command bar.
-//              */
-//              if (hwndCB != 0 && lParam == hwndCB) {
-//                      return super.WM_COMMAND (wParam, 0);
-//              }
-//      }
-//      return super.WM_COMMAND (wParam, lParam);
-//}
-//
+MRESULT WM_COMMAND (int mp1, int mp2) {
+        return super.WM_COMMAND (mp1, mp2);
+}
+
 //LRESULT WM_DESTROY (int wParam, int lParam) {
 //      LRESULT result = super.WM_DESTROY (wParam, lParam);
@@ -1270 +1250 @@
 //      return result;
 //}
-
-}
+MRESULT WM_CONTEXTMENU (int mp1, int mp2) {
+    System.out.println("Shell:WM_CONTEXTMENU - HANDLE = " + Integer.toHexString (handle));
+    return MRESULT.TRUE;
+}
+}