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

Timestamp:

Jun 23, 2000, 9:04:13 PM (25 years ago)

Author:

sandervl

Message:

wsprintf fix, menu accelerator fix

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.62 2000-06-17 09:45:00 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.63 2000-06-23 19:04:10 sandervl Exp $ */
 
 /*
@@ -984 +984 @@
 }
 //******************************************************************************
+//Helper for RedrawWindow (RDW_ALLCHILDREN_W)
+//******************************************************************************
+LRESULT WIN32API RedrawChildEnumProc(HWND hwnd, LPARAM lParam)
+{
+  RedrawWindow(hwnd, NULL, 0, lParam);
+  return TRUE;
+}
+//******************************************************************************
 // This implementation of RedrawWindow supports
 // RDW_ERASE
@@ -1145 +1153 @@
         if(redraw & RDW_ERASENOW_W && wnd->needsEraseBkgnd())
                 wnd->setEraseBkgnd(sendEraseBkgnd(wnd) == 0);
+        if(redraw & RDW_ALLCHILDREN_W) {
+                EnumChildWindows(wnd->getWindowHandle(), RedrawChildEnumProc, redraw);
+        }
    }
    else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
@@ -1180 +1191 @@
 
    dprintf (("User32: UpdateWindow hwnd %x", hwnd));
-////SvL: This doesn't work right (Wine uses RDW_NOCHILDREN_W -> doesn't work here)
-////     Breaks vpbuddy
-////   return RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_ALLCHILDREN_W);
+//SvL: This doesn't work right (Wine uses RDW_NOCHILDREN_W -> doesn't work here)
+//     Breaks vpbuddy
+//   return RedrawWindow(hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_ALLCHILDREN_W);
+//   -> RDW_UPDATENOW causes WM_PAINT messages to be directy posted to window
+//   handler; possibly bypassing queued WM_PAINT messages for parent window(s)
+//   -> out of sync painting (i.e. parent paints over child)
    WinUpdateWindow(wnd->getOS2WindowHandle());
    return TRUE;
@@ -1196 +1210 @@
    }
    else dprintf(("InvalidateRect %x NULL erase=%d", hwnd, erase));
+   if(hwnd == 0x6800000f) {
+        result = 0;
+   }
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |