Changeset 2006 for trunk/src

Timestamp:

Dec 7, 1999, 1:26:59 PM (26 years ago)

Author:

sandervl

Message:

Misc fixes for repaint problems

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.24 1999-12-04 00:04:19 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.25 1999-12-07 12:26:58 sandervl Exp $ */
 
 /*
@@ -516 +516 @@
 //      WinSendMsg( hwnd, /* WM_DRAW */ 0x20D, (MPARAM)hps, MPVOID );
       //CB: subclassed window haven't got a frame
-      if (!wnd->isSubclassedOS2Wnd()) selectClientArea(wnd, pHps, &rect);
+//      if (!wnd->isSubclassedOS2Wnd()) selectClientArea(wnd, pHps, &rect);
 //   }
 
@@ -562 +562 @@
    if (!wnd) goto exit;
 
-   if (wnd->isOwnDC())
+   if(wnd->isOwnDC())
    {
        pDCData pHps = (pDCData)GpiQueryDCData((HPS)pPaint->hdc);
@@ -568 +568 @@
        {
            removeClientArea (pHps);
-           WinEndPaint (pHps->hps);
+          WinEndPaint (pHps->hps);
        }
    }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.105 1999-12-05 16:37:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.106 1999-12-07 12:26:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -465 +465 @@
   if (cs->dwExStyle & WS_EX_DLGMODALFRAME) dwStyle &= ~WS_THICKFRAME;
 
-  //TODO?
-#if 0
-  /* Get class or window DC if needed */
-  if (classPtr->style & CS_OWNDC) dce = DCE_AllocDCE(hwnd,DCE_WINDOW_DC);
-  else if (classPtr->style & CS_CLASSDC) wndPtr->dce = classPtr->dce;
-  else wndPtr->dce = NULL;
-#endif
-
   if (cs->style & WS_HSCROLL)
   {
@@ -633 +625 @@
         SetIcon(windowClass->getIcon());
 
+  /* Get class or window DC if needed */
+  if(windowClass->getStyle() & CS_OWNDC) {
+        dprintf(("Class with CS_OWNDC style"));
+        ownDC = GetWindowDC(getWindowHandle());
+  }
+  else 
+  if (windowClass->getStyle() & CS_PARENTDC)  {
+        dprintf(("ERROR: Class with CS_PARENTDC style -> NOT IMPLEMENTED!"));
+        ownDC = 0;
+  }
+  else
+  if (windowClass->getStyle() & CS_CLASSDC)  {
+        dprintf(("ERROR: Class with CS_CLASSDC style -> NOT IMPLEMENTED!"));
+        ownDC = 0;
+  }
   /* Set the window menu */
   if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.49 1999-12-05 16:37:59 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.50 1999-12-07 12:26:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -364 +364 @@
          fakeOpen32WinBaseClass fakeWinBase;
 
-         BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
+//         BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
+         BOOL   isOwnDC() { return FALSE; }
          HDC    getOwnDC() { return ownDC; }
          void   setOwnDC(HDC hdc) { ownDC = hdc; }