Changeset 12550

Timestamp:

Dec 4, 1999, 1:04:19 AM (25 years ago)

Author:

sandervl

Message:

Experimental WM_ERASEBACKGND change

Location:

tags/trunk/src/user32

Files:

• dc.cpp (modified) (5 diffs)
• pmwindow.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (3 diffs)

tags/trunk/src/user32/dc.cpp ¶

@@ -1 @@
-/* $Id: dc.cpp,v 1.23 1999-11-26 17:06:06 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.24 1999-12-04 00:04:19 sandervl Exp $ */
 
 /*
@@ -527 +527 @@
    lpps->hdc = (HDC)hps;
 
-   if (wnd->isEraseBkgnd())
+//   if (wnd->isEraseBkgnd())
        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
    wnd->setSupressErase (FALSE);
@@ -841 +841 @@
    dprintf (("User32: UpdateWindow hwnd %x -> wnd %x", hwnd, wnd));
 
+#if 0
    if (WinQueryUpdateRect (wnd->getOS2WindowHandle(), NULL))
        sendEraseBkgnd (wnd);
+#endif
 
 #if 1
@@ -1272 +1274 @@
         return 0;
     }
-    dprintf(("ScrollWindow %x %d %d\n", hwnd, dx, dy));
+    dprintf(("ScrollWindow %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
     MapWin32ToOS2Rectl(window->getOS2WindowHandle(),window->getClientRect(), (PRECTLOS2)&clientRect);
     //Rectangle could be relative to parent window, so fix this
@@ -1334 +1336 @@
     }
 
-    dprintf(("ScrollWindowEx %x %d %d\n", hwnd, dx, dy));
+    dprintf(("ScrollWindowEx %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
 
     dy = revertDy (window, dy);

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.60 1999-11-30 12:39:14 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.61 1999-12-04 00:04:19 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -880 +880 @@
     {
         dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
+#if 1
+        break;
+#else
 
         if (WinQueryUpdateRect (hwnd, NULL) && !win32wnd->isSupressErase()) {
@@ -887 +890 @@
 
         break;
+#endif
     }
 
@@ -893 +897 @@
         dprintf(("OS2: WM_PAINT %x", hwnd));
 
+#if 0
         if (WinQueryUpdateRect (hwnd, NULL)) {
             if (!win32wnd->isSupressErase() && win32wnd->isEraseBkgnd()) {
@@ -901 +906 @@
 
         win32wnd->setSupressErase (FALSE);
+#endif
 
         win32wnd->MsgPaint(0, 0);

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.102 1999-12-02 19:30:40 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.103 1999-12-04 00:04:19 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1669 +1669 @@
         return 1;
     }
+    case WM_PAINTICON:
+    case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc = BeginPaint(getWindowHandle(), &ps );
+            if( hdc )
+            {
+              if( (getStyle() & WS_MINIMIZE) && getWindowClass()->getIcon())
+              {
+                int x = (rectWindow.right - rectWindow.left - GetSystemMetrics(SM_CXICON))/2;
+                int y = (rectWindow.bottom - rectWindow.top - GetSystemMetrics(SM_CYICON))/2;
+                    dprintf(("Painting class icon: vis rect=(%i,%i - %i,%i)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom ));
+                DrawIcon(hdc, x, y, getWindowClass()->getIcon() );
+              }
+              EndPaint(getWindowHandle(), &ps );
+            }
+            return 0;
+        }
+
     case WM_GETDLGCODE:
         return 0;
@@ -2612 +2631 @@
     {
         OSLibWinQueryWindowProcess(child->getOS2WindowHandle(), &pid, &tid);
-        
+
         if(dwThreadId == tid) {
             dprintf2(("EnumThreadWindows: Found Window %x", child->getWindowHandle()));