Changeset 1849 for trunk/src/user32/dc.cpp

Timestamp:

Nov 26, 1999, 6:06:09 PM (26 years ago)

Author:

cbratschi

Message:

map rect, WM_ERASEBKGND and other fixes

File:

• trunk/src/user32/dc.cpp (modified) (6 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.22 1999-11-12 11:38:45 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.23 1999-11-26 17:06:06 cbratschi Exp $ */
 
 /*
@@ -876 +876 @@
    {
 #if 1
-        // Don't do this for now (causes lots of desktop repaints in WordPad)
+        // Don't do this for now (causes lots of desktop repaints in WordPad)
          O32_SetLastError (ERROR_INVALID_PARAMETER);
          return FALSE;
@@ -1273 +1273 @@
     }
     dprintf(("ScrollWindow %x %d %d\n", hwnd, dx, dy));
-    MapWin32ToOS2Rectl(window->getClientRect(), (PRECTLOS2)&clientRect);
+    MapWin32ToOS2Rectl(window->getOS2WindowHandle(),window->getClientRect(), (PRECTLOS2)&clientRect);
     //Rectangle could be relative to parent window, so fix this
     if(clientRect.yBottom != 0) {
@@ -1284 +1284 @@
     }
     if(pScroll) {
-         MapWin32ToOS2Rectl((RECT *)pScroll, (PRECTLOS2)&scrollRect);
+         MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pScroll, (PRECTLOS2)&scrollRect);
          pScrollRect = &scrollRect;
 
@@ -1297 +1297 @@
 
     if(pClip) {
-         MapWin32ToOS2Rectl((RECT *)pClip, (PRECTLOS2)&clipRect);
+         MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pClip, (PRECTLOS2)&clipRect);
          pClipRect = &clipRect;
 
@@ -1341 +1341 @@
     if (scrollFlag & SW_SCROLLCHILDREN_W)  scrollFlags |= SW_SCROLLCHILDREN;
 
-    if(pScroll) MapWin32ToOS2Rectl((RECT *)pScroll, (PRECTLOS2)&scrollRect);
-    if(pClip)   MapWin32ToOS2Rectl((RECT *)pClip, (PRECTLOS2)&clipRect);
+    if(pScroll) MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pScroll, (PRECTLOS2)&scrollRect);
+    if(pClip)   MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pClip, (PRECTLOS2)&clipRect);
 
     RECTL rectlUpdate;