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

Timestamp:

Oct 3, 2001, 8:37:53 PM (24 years ago)

Author:

sandervl

Message:

window tracking rewrite + getdcex change (clipping)

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.111 2001-07-30 12:02:15 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.112 2001-10-03 18:37:51 sandervl Exp $ */
 
 /*
@@ -969 +969 @@
             int clipstyle = 0;
             int clipwnd   = HWND_TOP;
-            if(flags & (DCX_USESTYLE_W)) {
+            if(flags & (DCX_USESTYLE_W)) 
+            {
                 int style = wnd->getStyle();
                 if(style & WS_CLIPCHILDREN_W) {
@@ -990 +991 @@
                 clipstyle |= PSF_PARENTCLIP;
             }
-            if(clipstyle) {
+            //Always call WinGetClipPS; WinGetPS takes window & class style
+            //into account
+//            if(clipstyle || !(flags & DCX_DEFAULTCLIP_W)) {
                  dprintf2(("WinGetClipPS style %x", clipstyle));
                  hps = WinGetClipPS(hWindow, clipwnd, clipstyle);
-            }
-            else hps = WinGetPS (hWindow);
+//            }
+//            else hps = WinGetPS (hWindow);
 
             // default cp is OS/2 one: set to windows default (ODIN.INI)
@@ -1111 +1114 @@
         return GetDCEx( GetDesktopWindow(), 0, DCX_CACHE_W | DCX_WINDOW_W );
 
-    return GetDCEx (hwnd, NULL, 0);
+    return GetDCEx (hwnd, NULL, DCX_USESTYLE_W);
 }
 //******************************************************************************
@@ -1118 +1121 @@
 {
     if (!hwnd) hwnd = GetDesktopWindow();
-    return GetDCEx (hwnd, NULL, DCX_WINDOW_W);
+    return GetDCEx (hwnd, NULL, DCX_WINDOW_W | DCX_USESTYLE_W);
 }
 //******************************************************************************