Changeset 2521 for trunk/src/user32/oslibwin.cpp

Timestamp:

Jan 26, 2000, 7:02:38 PM (26 years ago)

Author:

cbratschi

Message:

refixed WM_WINDOWPOS*

File:

• trunk/src/user32/oslibwin.cpp (modified) (9 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.63 2000-01-21 13:30:34 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.64 2000-01-26 18:02:34 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -93 +93 @@
 
   if (*hwndFrame) {
-    hwndClient = WinCreateWindow (*hwndFrame,saveBits ? WIN32_STDCLASS:WIN32_STDCLASS2,
+    hwndClient = WinCreateWindow (*hwndFrame,saveBits ? WIN32_STDCLASS2:WIN32_STDCLASS,
                                   NULL, dwClientStyle, 0, 0, 0, 0,
                                   *hwndFrame, HWND_TOP, FID_CLIENT, NULL, NULL);
@@ -525 +525 @@
         point.x = swpFrame.x;
         point.y = swpFrame.y;
-        if(hParent)
+
+        if (hParent)
         {
-                WinMapWindowPoints(hParent, HWND_DESKTOP, &point, 1);
+          RECTL parentRect;
+
+          WinQueryWindowRect(hParent,&parentRect);
+          parentHeight = parentRect.yTop;
+        } else
+        {
+          parentHeight = ScreenHeight;
         }
-        point.y = ScreenHeight-point.y-swpFrame.cy;
+
+        point.y = parentHeight-point.y-swpFrame.cy;
 
         cy = swpFrame.cy;
@@ -610 +618 @@
     if(fuFlags & (SWP_MOVE | SWP_SIZE))
     {
+        if (hParent)
+        {
+          RECTL parentRect;
+
+          WinQueryWindowRect(hParent,&parentRect);
+          parentHeight = parentRect.yTop;
+        } else
+        {
+          parentHeight = ScreenHeight;
+        }
+
         point.x = x;
-        point.y = y;
-
-        if(hParent)
-        {
-                WinMapWindowPoints(hParent, HWND_DESKTOP, &point, 1);
-        }
-        point.y = ScreenHeight-point.y-cy;
+        point.y = parentHeight-y-cy;
 
         x  = point.x;
@@ -706 +719 @@
          y = pswpOld->y;
 
-         if (!((y == 0) && (pswpOld->cy == 0)))
-         {
-            y = parentHeight-y-pswpOld->cy;
-         }
+         y = parentHeight-y-pswpOld->cy;
       }
 
@@ -724 +734 @@
       y  = parentHeight-y-cy;
 
-
-       if ((pswpOld->x == x) && (pswpOld->y == y))
+      if ((pswpOld->x == x) && (pswpOld->y == y))
          flags &= ~SWP_MOVE;
 
@@ -757 +766 @@
    UINT fuFlags         = pwpos->flags;
    ULONG parentHeight;
-   POINTL point;
 
    HWND  hWinAfter;
@@ -787 +795 @@
    if (flags & (SWP_MOVE | SWP_SIZE))
    {
-      point.x = x;
-      point.y = y;
-
-      if(hParent) {
-            parentHeight = OSLibGetWindowHeight(hParent);
-
-            point.y = ScreenHeight-point.y-cy;
-            WinMapWindowPoints(HWND_DESKTOP, hParent, &point, 1);
-            point.y = parentHeight-point.y-cy;
+      if (hParent)
+      {
+        RECTL parentRect;
+
+        WinQueryWindowRect(hParent,&parentRect);
+        parentHeight = parentRect.yTop;
+      } else
+      {
+        parentHeight = ScreenHeight;
       }
-      else  parentHeight = ScreenHeight;
-
-      x  = point.x;
-      y  = point.y;
 
       if (flags & SWP_SIZE)
@@ -814 +818 @@
       y  = parentHeight-y-cy;
 
-
-       if ((pswpOld->x == x) && (pswpOld->y == y))
+      if ((pswpOld->x == x) && (pswpOld->y == y))
          flags &= ~SWP_MOVE;