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

Timestamp:

Oct 13, 1999, 4:24:49 PM (26 years ago)

Author:

sandervl

Message:

lots of changes

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.25 1999-10-12 20:16:23 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.26 1999-10-13 14:24:25 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -139 +139 @@
     {
       *OSFrameStyle |= FCF_SIZEBORDER;
-      *borderHeight = *borderWidth = 1;
-
+      *borderHeight = *borderWidth = 2;
     } 
     else
@@ -579 +578 @@
 void OSLibMapWINDOWPOStoSWP(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame)
 {
+ BOOL fCvt = FALSE;
+
    HWND hWnd            = pwpos->hwnd;
    HWND hWndInsertAfter = pwpos->hwndInsertAfter;
@@ -625 +626 @@
          y = pswpOld->y;
 
-//SvL: TEST
-#if 0
          if (!((y == 0) && (pswpOld->cy == 0)))
          {
             y = parentHeight - y - pswpOld->cy;
          }
-#endif
       }
  
@@ -666 +664 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinCalcFrameRect(HWND hwndFrame, RECTLOS2 *pRect, BOOL fClient)
-{
-   return WinCalcFrameRect(hwndFrame, (PRECTL)pRect, fClient);
+BOOL  OSLibWinCalcFrameRect(HWND hwndFrame, RECT *pRect, BOOL fClient)
+{
+ BOOL rc;
+ 
+   WinMapWindowPoints(hwndFrame, HWND_DESKTOP, (PPOINTL)pRect, 2);
+
+   rc = WinCalcFrameRect(hwndFrame, (PRECTL)pRect, fClient);
+   WinMapWindowPoints(HWND_DESKTOP, hwndFrame, (PPOINTL)pRect, 2);
+
+   return rc;
 }
 //******************************************************************************