Changeset 385 for trunk/src/user32/new/oslibwin.cpp

Timestamp:

Jul 24, 1999, 4:01:45 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.18 1999-07-20 15:46:53 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.19 1999-07-24 14:01:44 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -183 +183 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinInvalidateRect(HWND hwnd,POSRECTL pwrc,BOOL fIncludeChildren)
-{
-  return WinInvalidateRect(hwnd,(PRECTL)pwrc,fIncludeChildren);
-}
-//******************************************************************************
-//******************************************************************************
 LONG OSLibWinQuerySysValue(HWND hwndDeskTop,LONG iSysValue)
 {
@@ -260 +254 @@
 }
 //******************************************************************************
-//Returns rectangle in Win32 window coordinates
-//******************************************************************************
-BOOL OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect)
-{
- BOOL rc;
+//******************************************************************************
+BOOL OSLibWinQueryWindowRect(HWND hwnd, PRECT pRect, int RelativeTo)
+{
+ BOOL     rc;
  RECTLOS2 rectl;
 
-  rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
+  rc = WinQueryWindowRect(hwnd, (PRECTL)&rectl);
   if(rc) {
-        MapOS2ToWin32Rectl(&rectl, (PRECT)pRect);
+        if(RelativeTo == RELATIVE_TO_SCREEN) {
+                MapOS2ToWin32Rectl(OSLIB_HWND_DESKTOP, hwnd, &rectl, pRect);
+        }
+        else    MapOS2ToWin32Rectl(&rectl, pRect);
   }
   else  memset(pRect, 0, sizeof(RECT));