Changeset 106 for trunk/src

Timestamp:

Jun 24, 2008, 9:37:38 PM (17 years ago)

Author:

lpino

Message:

• Sync

Location:

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

Files:

• Control.java (modified) (5 diffs)
• Decorations.java (modified) (8 diffs)
• Display.java (modified) (1 diff)
• Menu.java (modified) (3 diffs)
• TabFolder.java (modified) (1 diff)

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

@@ -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?
@@ -3104 +3104 @@
 //      if (mp2 != handle) return null;
 //      int parentHandle = OS.WinQueryWindow(menu.handle, OS.QW_PARENT);
-//      System.out.println("Control:WM_CONTEXTMENU - PARENTHANDLE = " + Integer.toHexString(parentHandle));
-//      System.out.println("Control:WM_CONTEXTMENU - PARENTHANDLE = " + Integer.toHexString(handle));
+      System.out.println("Control:WM_CONTEXTMENU - PARENTHANDLE = " + Integer.toHexString(handle));
+      System.out.println("Control:WM_CONTEXTMENU - SHORT1FROMMP = " + OS.SHORT1FROMMP(mp1));
+      System.out.println("Control:WM_CONTEXTMENU - SHORT2FROMMP = " + OS.SHORT2FROMMP(mp1));
       short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | 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);
-//      }
+      boolean rc = OS.WinPopupMenu(handle, handle, menu.handle, 0, 150, OS.SHORT1FROMMP(mp1), flOptions);
       return MRESULT.TRUE;
 }
@@ -3867 +3865 @@
 //}
 //
-//LRESULT WM_SYSCOMMAND (int wParam, int lParam) {
+MRESULT WM_SYSCOMMAND (int mp1, int mp2) {
 //      /*
 //      * Check to see if the command is a system command or
@@ -3884 +3882 @@
 //
 //      /* Process the System Command */
-//      int cmd = wParam & 0xFFF0;
-//      switch (cmd) {
-//              case OS.SC_CLOSE:
-//                      int hwndShell = menuShell ().handle;
-//                      int bits = OS.GetWindowLong (hwndShell, OS.GWL_STYLE);
-//                      if ((bits & OS.WS_SYSMENU) == 0) return LRESULT.ZERO;
-//                      break;
+      int cmd = mp1 & 0xFFFF;
+      switch (cmd) {
+              case OS.SC_CLOSE:
+                      int hwndShell = menuShell ().handle;
+//                      int bits =  OS.WinQueryWindowULong (frameHandle, OS.QWL_STYLE);
+//                      if ((bits & OS.WS_SYSMENU) == 0) return MRESULT.ZERO;
+                      break;
 //              case OS.SC_KEYMENU:
 //                      if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
@@ -3932 +3930 @@
 //                      menuShell ().saveFocus ();
 //                      break;
-//      }
-//      return null;
-//}
-//
+      }
+      return MRESULT.ZERO;
+}
+
 //LRESULT WM_SYSKEYDOWN (int wParam, int lParam) {
 //      Display display = getDisplay ();

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

@@ -261 +261 @@
 public Rectangle computeTrim (int x, int y, int width, int height) {
         checkWidget ();
-    
-//@@TEMP(dmik): in the future should take scroll bars into account (and menu)?
-//      /* Get the size of the trimmings */
-//      RECT rect = new RECT ();
-//      OS.SetRect (rect, x, y, x + width, y + height);
-//      int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
-//      boolean hasMenu = OS.IsWinCE ? false : OS.GetMenu (handle) != 0;
-//      OS.AdjustWindowRectEx (rect, bits, hasMenu, OS.GetWindowLong (handle, OS.GWL_EXSTYLE));
-//
-//      /* Get the size of the scroll bars */
-//      if (horizontalBar != null) rect.bottom += OS.GetSystemMetrics (OS.SM_CYHSCROLL);
-//      if (verticalBar != null) rect.right += OS.GetSystemMetrics (OS.SM_CXVSCROLL);
-//
-//      /* Get the height of the menu bar */
+        RECTL rcl = new RECTL ();
+    rcl.xLeft = x; rcl.yBottom = y;
+     rcl.xRight = x + width; rcl.yTop = y + height;
+     
+     /* Get the size of the scroll bars */
+    if (horizontalBar != null) rcl.xRight += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CXVSCROLL);
+    if (verticalBar != null) rcl.yTop += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CYHSCROLL);
+    /* Get the height of the menu bar */
+    //@@TEMP(lpino): I'm not sure if we need to calculate the height of the menu using SV_CYMENU'
 //      if (hasMenu) {
 //              RECT testRect = new RECT ();
@@ -285 +280 @@
 //              }
 //      }
-//      return new Rectangle (rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
-    RECTL rcl = new RECTL ();
-    rcl.xLeft = x; rcl.yBottom = y;
-    rcl.xRight = x + width; rcl.yTop = y + height;
     OS.WinCalcFrameRect (frameHandle, rcl, false);
-    return new Rectangle (rcl.xLeft, rcl.yBottom,
-        rcl.xRight - rcl.xLeft, rcl.yTop - rcl.yBottom);
+    return new Rectangle (rcl.xLeft, rcl.yBottom, rcl.xRight - rcl.xLeft, rcl.yTop - rcl.yBottom);
 }
 
@@ -423 +413 @@
     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;
@@ -587 +577 @@
 }
 
-//@@TODO(dmik)    
-///**
-// * Returns the receiver's menu bar if one had previously
-// * been set, otherwise returns null.
-// *
-// * @return the menu bar or null
-// *
-// * @exception SWTException <ul>
-// *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
-// *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
-// * </ul>
-// */
+   
+/**
+ * Returns the receiver's menu bar if one had previously
+ * been set, otherwise returns null.
+ *
+ * @return the menu bar or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
 public Menu getMenuBar () {
         checkWidget ();
@@ -1108 +1098 @@
 
 //@@TODO(dmik)
-//void setParent () {
-//      /*
-//      * In order for an MDI child window to support
-//      * a menu bar, setParent () is needed to reset
-//      * the parent.  Otherwise, the MDI child window
-//      * will appear as a separate shell.  This is an
-//      * undocumented and possibly dangerous Windows
-//      * feature.
-//      */
-//      Display display = getDisplay ();
-//      int hwndParent = parent.handle;
-//      display.lockActiveWindow = true;
-//      OS.SetParent (handle, hwndParent);
-//      if (!OS.IsWindowVisible (hwndParent)) {
-//              OS.ShowWindow (handle, OS.SW_SHOWNA);
-//      }
-//      display.lockActiveWindow = false;
-//}
+void setParent () {
+        Display display = getDisplay ();
+        int hwndParent = parent.handle;
+        display.lockActiveWindow = true;
+        OS.WinSetParent (handle, hwndParent, false);
+        if (!OS.WinIsWindowVisible (hwndParent)) {
+                OS.WinShowWindow (handle, true);
+        }
+        display.lockActiveWindow = false;
+}
 
 public void setRedraw (boolean redraw) {
@@ -1150 +1132 @@
 }
 
-//@@TODO (dmik): later
-//void setSystemMenu () {
+//@@TODO (lpino): Understand and complete
+void setSystemMenu () {
+    int hMenu = OS.WinWindowFromID(frameHandle, OS.FID_SYSMENU);
+    if (hMenu == 0) return;
+    int oldCount = OS.WinSendMsg(hMenu, OS.MM_QUERYITEMCOUNT, 0, 0);
 //      if (OS.IsWinCE) return;
 //      int hMenu = OS.GetSystemMenu (handle, false);
@@ -1188 +1173 @@
 //              }
 //      }
-//}
+}
 
 /**
@@ -1453 +1438 @@
                 sendEvent (SWT.Activate);
                 if (isDisposed ()) return MRESULT.ZERO;
-//@@TODO (dmik): remove        
-//              if (restoreFocus ()) return MRESULT.ZERO;
                 restoreFocus ();
         }

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

@@ -134 +134 @@
 //@@TODO (dmik): not yet sure what do we need from these:    
 //    boolean lastVirtual;
-//    boolean lockActiveWindow;
+    boolean lockActiveWindow;
 //    int lastKey, lastAscii, lastMouse;
 //    byte [] keyboard = new byte [256];

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

@@ -2 +2 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2007 EclipseOS2 Team.
+ * Copyright (c) 2002, 2008 EclipseOS2 Team.
  */
 
@@ -242 +242 @@
 //);
         } else  if ((style & SWT.POP_UP) != 0) {
-            handle = OS.WinCreateWindow (parent.handle,                     /* parent window */
+            handle = OS.WinCreateWindow (OS.HWND_DESKTOP,                     /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
                                                         null,                                               /* window text */
                                                         0,                                                   /* window style */
                                                         0, 0, 0, 0,                                       /* size and position */
-                                                        parent.handle,                              /* owner window */
+                                                        OS.HWND_DESKTOP,                              /* owner window */
                                                         OS.HWND_TOP,                            /* sibling window */
                                                         0,                                                  /* ID */
@@ -298 +298 @@
         info.afAttribute = 0;
         info.id = (short)item.id;
-        System.out.println("Menu:createItem ID = " + info.id);
         info.hwndSubMenu = OS.NULLHANDLE;
         info.hItem = 0;

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

@@ -3 +3 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2004 EclipseOS2 Team.
+ * Copyright (c) 2002, 2008 EclipseOS2 Team.
  */