Changeset 324 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Jul 17, 1999, 8:30:52 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.6 1999-07-17 15:23:38 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.7 1999-07-17 18:30:51 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -164 +164 @@
     case WM_MOVE:
     {
-     RECTL  rectl, rectl2;
-     POINTL point;
-     HWND   hwndParent;
-     ULONG  xScreen, yScreen, yParent, xParent;
+      RECTL rectChild;
+      ULONG xParent, yParent;
 
         dprintf(("OS2: WM_MOVE %x", hwnd));
-        rc = WinQueryWindowRect(hwnd, &rectl);
-        if(rc == TRUE) {
-                point.x = rectl.xLeft;
-                point.y = rectl.yBottom;
-
-                //If the window has a parent, calculate position relative to that window
-                if((hwndParent = WinQueryWindow(hwnd, QW_PARENT)) != WinQueryDesktopWindow(hab, NULLHANDLE)) {
-                        rc = WinMapWindowPoints(hwnd, hwndParent, &point, 1);
-                        if(rc == FALSE) {
-                                dprintf(("WM_MOVE: WinMapWindowPoints (parent) failed!"));
-                                break;
-                        }
-                        rc = WinQueryWindowRect(hwndParent, &rectl2);
-                        if(rc == FALSE) {
-                                dprintf(("WM_MOVE: WinQueryWindowRect(HWND_DESKTOP, &rectl) failed!"));
-                                break;
-                        }
-                        xParent = point.x;
-                        yParent = OS2TOWIN32POINT(rectl2.yTop - rectl2.yBottom, point.y);
-                }
-                else    xParent = yParent = -1;
-
-                point.x = rectl.xLeft;
-                point.y = rectl.yBottom;
-
-                rc = WinMapWindowPoints(hwnd, HWND_DESKTOP, &point, 1);
-                if(rc == FALSE) {
-                        dprintf(("WM_MOVE: WinMapWindowPoints (desktop) failed!"));
-                        break;
-                }
-                rc = WinQueryWindowRect(HWND_DESKTOP, &rectl);
-                if(rc == FALSE) {
-                        dprintf(("WM_MOVE: WinQueryWindowRect(HWND_DESKTOP, &rectl) failed!"));
-                        break;
-                }
-                xScreen = point.x;
-                yScreen = OS2TOWIN32POINT(rectl.yTop - rectl.yBottom, point.y);
-
-                if(win32wnd->MsgMove(xScreen, yScreen, xParent, yParent)) {
-                        goto RunDefWndProc;
-                }
-        }
-        else {
-                dprintf(("WM_MOVE: WinQueryWindowRect failed!"));
+
+        WinQueryWindowRect(hwnd, &rectChild);
+
+        //Calculate position relative to parent window (real window or desktop)
+        xParent = rectChild.xLeft;
+        yParent = MapOS2ToWin32Y(hwnd, &rectChild, rectChild.yBottom);
+
+        if(win32wnd->MsgMove(xParent, yParent)) {
+                goto RunDefWndProc;
         }
         break;
@@ -266 +229 @@
                 goto RunDefWndProc;
         }
-
         break;
     }