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

Timestamp:

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

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/window.cpp (modified) (4 diffs)

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.8 1999-07-23 19:09:25 cbratschi Exp $ */
+/* $Id: window.cpp,v 1.9 1999-07-24 14:01:45 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -20 +20 @@
 #include <win32wnd.h>
 #include <oslibwin.h>
+#include <oslibgdi.h>
 #include "user32.h"
 #include "icon.h"
@@ -588 +589 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API GetClientRect( HWND arg1, PRECT  arg2)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetClientRect of %X\n", arg1);
-#endif
-    arg1 = Win32Window::Win32ToOS2Handle(arg1);
-    return O32_GetClientRect(arg1, arg2);
+BOOL WIN32API GetClientRect( HWND hwnd, PRECT pRect)
+{
+#ifdef DEBUG
+    WriteLog("USER32:  GetClientRect of %X\n", hwnd);
+#endif
+    hwnd = Win32Window::Win32ToOS2Handle(hwnd);
+    return OSLibWinQueryWindowRect(hwnd, pRect);
+//    return O32_GetClientRect(hwnd, arg2);
 }
 //******************************************************************************
@@ -860 +862 @@
     if (!lpRect) return FALSE;
 
-    return OSLibWinQueryUpdateRect(Win32Window::Win32ToOS2Handle(hwnd), (PVOID)&lpRect);
+    return OSLibWinQueryUpdateRect(Win32Window::Win32ToOS2Handle(hwnd), lpRect);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API InvalidateRect(HWND hWnd, const RECT *lpRect, BOOL bErase)
+{
+#ifdef DEBUG
+    if(lpRect)
+         WriteLog("USER32:  InvalidateRect for window %X (%d,%d)(%d,%d) %d\n", hWnd, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, bErase);
+    else WriteLog("USER32:  InvalidateRect for window %X NULL, %d\n", hWnd, bErase);
+#endif
+
+    //CB: bErase no quite the same
+    hWnd = Win32Window::Win32ToOS2Handle(hWnd);
+    if (lpRect)
+    {
+         return OSLibWinInvalidateRect(hWnd, (PRECT)lpRect, bErase);
+    } 
+    else return OSLibWinInvalidateRect(hWnd,NULL,bErase);
 }
 //******************************************************************************