Changeset 2483 for trunk/src/user32/win32wbase.cpp

Timestamp:

Jan 20, 2000, 5:48:58 PM (26 years ago)

Author:

cbratschi

Message:

WM_CONTEXTMENU, sysmenu changes

File:

• trunk/src/user32/win32wbase.cpp (modified) (5 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.142 2000-01-18 20:10:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.143 2000-01-20 16:48:56 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1055 +1055 @@
     //set new window rectangle
     setWindowRect(lpWndPos->x, lpWndPos->y, lpWndPos->x + lpWndPos->cx, lpWndPos->y + lpWndPos->cy);
+    if (getParent()) mapWin32Rect(getParent()->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,&rectWindow);
     newWindowRect= rectWindow;
   }
@@ -1413 +1414 @@
             DWORD lParam;
 
-            if(getParent()) {//in parent coordinates
-                POINT point;
-
-                point.x = rectClient.left;
-                point.y = rectClient.top;
-                ClientToScreen(getParent()->getWindowHandle(),&point);
-
-                lParam = MAKELONG(point.x, point.y);
-            }
-            else {//in screen coordinates
-                lParam = MAKELONG(rectClient.left,rectClient.top);
+            if (dwStyle & WS_CHILD)
+            {
+              lParam = MAKELONG(rectClient.left,rectClient.top);
+            } else
+            {
+              POINT point;
+
+              point.x = rectClient.left;
+              point.y = rectClient.top;
+              if (getParent()) ClientToScreen(getParent()->getWindowHandle(),&point);
+
+              lParam = MAKELONG(point.x, point.y);
             }
             SendInternalMessageA(WM_MOVE, 0, lParam);
@@ -2046 +2048 @@
    HWND hParent = 0;
 
-    dprintf (("SetWindowPos %x %x (%d,%d)(%d,%d) %x", Win32Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags));
-
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -2064 +2064 @@
     WINDOWPOS wpos;
     SWP swp, swpOld;
+
+#if 0 //CB: test: MSIE 2.0 displays the tool-/addressbar this way -> to check
+  //CB: cx or cy are 0
+if (cx == 0) cx = 50;
+if (cy == 0) cy = 50;
+#endif
 
     wpos.flags            = fuFlags;