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

Timestamp:

Dec 29, 1999, 11:54:04 PM (26 years ago)

Author:

cbratschi

Message:

new mapping functions, fixed 1 pixel and window handle bugs

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.55 1999-12-29 12:39:44 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.56 1999-12-29 22:54:01 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -325 +325 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinSetWindowPos(HWND hwnd, HWND hwndInsertBehind, LONG x, LONG y, LONG cx,
-                          LONG cy, ULONG fl)
-{
- HWND hwndParent = hwndInsertBehind;
- BOOL rc;
-
-    if(fl & SWP_MOVE) {
-        switch(hwndParent)
-        {
-            case HWNDOS_TOP:
-            case HWNDOS_BOTTOM:
-                hwndParent = HWND_DESKTOP;
-                break;
-        }
-        y = MapOS2ToWin32Y(hwndParent, cy, y);
-    }
-    rc = WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
-    dprintf(("WinSetWindowPos %x %x %d %d %d %d %x returned %d (%x)", hwnd, hwndInsertBehind, x, y, cx, cy, fl, rc, WinGetLastError(GetThreadHAB())));
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
 BOOL OSLibWinSetMultWindowPos(PSWP pswp, ULONG num)
 {
@@ -383 +361 @@
   if(rc) {
         if(RelativeTo == RELATIVE_TO_SCREEN) {
-                MapOS2ToWin32Rectl(OSLIB_HWND_DESKTOP, hwnd, &rectl, pRect);
+                mapOS2ToWin32Rect(hwnd,OSLIB_HWND_DESKTOP,&rectl,pRect);
         }
-        else    MapOS2ToWin32WindowRect(&rectl, pRect);
+        else    mapOS2ToWin32Rect(hwnd,&rectl,pRect);
   }
   else  memset(pRect, 0, sizeof(RECT));
@@ -556 +534 @@
                 WinMapWindowPoints(hParent, HWND_DESKTOP, &point, 1);
         }
-        point.y = OSLibQueryScreenHeight() - point.y - swpFrame.cy;
+        point.y = ScreenHeight-point.y-swpFrame.cy;
 
         cy = swpFrame.cy;
@@ -579 +557 @@
 
     pswpOld->x  = pswp->x;
-    pswpOld->y  = swpFrame.cy - pswp->y - pswp->cy;
+    pswpOld->y  = swpFrame.cy-pswp->y-pswp->cy;
     pswpOld->cx = pswp->cx;
     pswpOld->cy = pswp->cy;
@@ -643 +621 @@
                 WinMapWindowPoints(hParent, HWND_DESKTOP, &point, 1);
         }
-        point.y = OSLibQueryScreenHeight() - point.y - cy;
+        point.y = ScreenHeight-point.y-cy;
 
         x  = point.x;
@@ -664 +642 @@
 
     pswpOld->x  = swpClient.x;
-    pswpOld->y  = pswp->cy - swpClient.y - swpClient.cy;
+    pswpOld->y  = pswp->cy-swpClient.y-swpClient.cy;
     pswpOld->cx = swpClient.cx;
     pswpOld->cy = swpClient.cy;
@@ -734 +712 @@
          if (!((y == 0) && (pswpOld->cy == 0)))
          {
-            y = parentHeight - y - pswpOld->cy;
+            y = parentHeight-y-pswpOld->cy;
          }
       }
@@ -748 +726 @@
          cy = pswpOld->cy;
       }
-      y  = parentHeight - y - cy;
+      y  = parentHeight-y-cy;
 
 
@@ -819 +797 @@
             parentHeight = OSLibGetWindowHeight(hParent);
 
-            point.y = ScreenHeight - point.y - cy;
+            point.y = ScreenHeight-point.y-cy;
             WinMapWindowPoints(HWND_DESKTOP, hParent, &point, 1);
-            point.y = parentHeight - point.y - cy;
+            point.y = parentHeight-point.y-cy;
       }
       else  parentHeight = ScreenHeight;
@@ -838 +816 @@
          cy = pswpOld->cy;
       }
-      y  = parentHeight - y - cy;
+      y  = parentHeight-y-cy;