Changeset 138 for trunk/src

Timestamp:

May 18, 2009, 11:25:41 PM (16 years ago)

Author:

lpino

Message:

• More details for missing implementations

Location:

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

Files:

• Decorations.java (modified) (5 diffs)
• Display.java (modified) (1 diff)
• Shell.java (modified) (4 diffs)

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

@@ -421 +421 @@
 //);
 //@@TODO(dmik): do something for MDI windows if needed    
-//    if (parent == null) return;
-//    setParent ();
+    if (parent == null) return;
+    setParent ();
 //    setSystemMenu ();
 }
 
-//@@TODO(dmik): remove/later?
-//void createWidget () {
-//    super.createWidget ();
-//    swFlags = OS.IsWinCE ? OS.SW_SHOWMAXIMIZED : OS.SW_SHOWNOACTIVATE;
-//    hAccel = -1;
-//}
 
 void destroyAcceleratorTable () {
@@ -1097 +1091 @@
 }
 
-//@@TODO(dmik)
 void setParent () {
         Display display = getDisplay ();
@@ -1137 +1130 @@
     if (hMenu == 0) return;
     int oldCount = OS.WinSendMsg(hMenu, OS.MM_QUERYITEMCOUNT, 0, 0);
-//      if (OS.IsWinCE) return;
-//      int hMenu = OS.GetSystemMenu (handle, false);
-//      if (hMenu == 0) return;
-//      int oldCount = OS.GetMenuItemCount (hMenu);
-//      if ((style & SWT.RESIZE) == 0) {
-//              OS.DeleteMenu (hMenu, OS.SC_SIZE, OS.MF_BYCOMMAND);
-//      }
-//      if ((style & SWT.MIN) == 0) {
-//              OS.DeleteMenu (hMenu, OS.SC_MINIMIZE, OS.MF_BYCOMMAND);
-//      }
-//      if ((style & SWT.MAX) == 0) {
-//              OS.DeleteMenu (hMenu, OS.SC_MAXIMIZE, OS.MF_BYCOMMAND);
-//      }
-//      if ((style & (SWT.MIN | SWT.MAX)) == 0) {
-//              OS.DeleteMenu (hMenu, OS.SC_RESTORE, OS.MF_BYCOMMAND);
-//      }
-//      int newCount = OS.GetMenuItemCount (hMenu);
-//      if ((style & SWT.CLOSE) == 0 || newCount != oldCount) { 
-//              OS.DeleteMenu (hMenu, OS.SC_TASKLIST, OS.MF_BYCOMMAND);
+    int itemID = OS.WinSendMsg(hMenu, OS.MM_ITEMIDFROMPOSITION, 0, 0);
+    MENUITEM info = new MENUITEM();
+    OS.WinSendMsg (hMenu, OS.MM_QUERYITEM,  OS.MPFROM2SHORT ((short)itemID, (short)OS.TRUE), info);
+    int hSubMenu = info.hwndSubMenu;
+        if ((style & SWT.RESIZE) == 0) {
+            OS.WinSendMsg(hSubMenu, OS.MM_REMOVEITEM, OS.MPFROM2SHORT((short)OS.SC_SIZE, (short)OS.FALSE), 0);
+        }
+        if ((style & SWT.MIN) == 0) {
+                OS.WinSendMsg(hSubMenu, OS.MM_REMOVEITEM, OS.MPFROM2SHORT((short)OS.SC_MINIMIZE , (short)OS.FALSE), 0);
+        }
+        if ((style & SWT.MAX) == 0) {
+                OS.WinSendMsg(hSubMenu, OS.MM_REMOVEITEM, OS.MPFROM2SHORT((short)OS.SC_MAXIMIZE  , (short)OS.FALSE), 0);
+        }
+        if ((style & (SWT.MIN | SWT.MAX)) == 0) {
+                OS.WinSendMsg(hSubMenu, OS.MM_REMOVEITEM, OS.MPFROM2SHORT((short)OS.SC_RESTORE  , (short)OS.FALSE), 0);
+        }
+
+        int newCount = OS.WinSendMsg (hSubMenu, OS.MM_QUERYITEMCOUNT,  0, 0);
+        if ((style & SWT.CLOSE) == 0 || newCount != oldCount) { 
+                OS.WinSendMsg(hSubMenu, OS.MM_REMOVEITEM, OS.MPFROM2SHORT((short)OS.SC_TASKMANAGER  , (short)OS.FALSE), 0);
 //              MENUITEMINFO info = new MENUITEMINFO ();
 //              info.cbSize = MENUITEMINFO.sizeof;
@@ -1172 +1166 @@
 //                      }
 //              }
-//      }
+        }
 }
 
@@ -1458 +1452 @@
 MRESULT FRAME_WM_CHAR (int mp1, int mp2) {
 //@@TODO (dmik): debug, remove    
-//boolean keyUp = (OS.SHORT1FROMMP (mp1) & OS.KC_KEYUP) != 0;
+boolean keyUp = (OS.SHORT1FROMMP (mp1) & OS.KC_KEYUP) != 0;
 //System.out.println("FRAME_WM_CHAR ("+this+"): keyup="+keyUp);
     /*

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

@@ -1632 +1632 @@
  * </ul>
  */
-//public void setCursorLocation (Point point) {
-//    checkDevice ();
-//    if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
-//    OS.SetCursorPos (point.x, point.y); WinSetPointerPos
-//}
+public void setCursorLocation (Point point) {
+    checkDevice ();
+    if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
+    OS.WinSetPointerPos(OS.HWND_DESKTOP, point.x, point.y);
+}
 
 /**

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

@@ -105 +105 @@
 //    int hIMC;
 //    int [] brushes;
-//    boolean showWithParent;
+    boolean showWithParent;
 //    int toolTipHandle, lpstrTip;
     Control lastActive;
@@ -523 +523 @@
  * @see Shell#setActive
  */
-//@@TODO(dmik): later
-//public void forceActive () {
-//      checkWidget ();
-//      OS.SetForegroundWindow (handle);
-//}
+
+public void forceActive () {
+        checkWidget ();
+        OS.WinSetFocus (OS.HWND_DESKTOP, frameHandle);
+}
 
 int getBounds (SWP swp)
@@ -1025 +1025 @@
     super.setVisible (visible);
 //@@TODO(dmik): add modality support
-//    if (showWithParent == visible) return;
-//    showWithParent = visible;
+    if (showWithParent == visible) return;
+    showWithParent = visible;
 //    if (!OS.IsWinCE) OS.ShowOwnedPopups (handle, visible);
-//    int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
+    int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
 //    if ((style & mask) != 0) {
 //        if (visible) {
@@ -1034 +1034 @@
 //            Control control = display.getFocusControl ();
 //            if (control != null && !control.isActive ()) bringToTop ();
-//            OS.ReleaseCapture ();
+//            OS.WinSetCapture (OS.HWND_DESKTOP, OS.NULLHANDLE);
 //        } else {
 //            display.clearModal (this);