Changeset 2433 for trunk/src/user32/new/dc.cpp

Timestamp:

Jan 13, 2000, 9:11:39 PM (26 years ago)

Author:

sandervl

Message:

Client rectangle changes, GetDCEx bugfix (CS_OWNDC), scroll rectangle calculation fixes

File:

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

trunk/src/user32/new/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.11 2000-01-12 17:37:28 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.12 2000-01-13 20:11:36 sandervl Exp $ */
 
 /*
@@ -679 +679 @@
 //   isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : (wnd->isOwnDC() && wnd->getOwnDC()))
    isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : (wnd->isOwnDC()))
-                 && !(flags & DCX_CACHE_W));
+                 && !(flags & DCX_CACHE_W|DCX_WINDOW_W));
 
    if (isWindowOwnDC)
@@ -814 +814 @@
       //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
 //      isOwnDC = wnd->isOwnDC() && wnd->getOwnDC();
-      isOwnDC = wnd->isOwnDC();
+      isOwnDC = wnd->isOwnDC() && (wnd->getOwnDC() == hdc);
    }
    if (isOwnDC)
@@ -839 +839 @@
 #endif
 
-#if 1
    WinUpdateWindow(wnd->getOS2FrameWindowHandle());
-#else
-   wnd->MsgPaint(0);
-#endif
 
    return (TRUE);
@@ -1271 +1267 @@
     dprintf(("ScrollWindow %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
     mapWin32ToOS2Rect(window,window->getClientRectPtr(),(PRECTLOS2)&clientRect);
+#if 0
     //Rectangle could be relative to parent window, so fix this
     if(clientRect.yBottom != 0) {
@@ -1280 +1277 @@
         clientRect.xLeft   = 0;
     }
+#endif
     if(pScroll) {
          mapWin32ToOS2Rect(window,(RECT *)pScroll, (PRECTLOS2)&scrollRect);