Changeset 2202 for trunk/src

Timestamp:

Dec 24, 1999, 10:44:04 PM (26 years ago)

Author:

sandervl

Message:

some fixes

Location:

trunk/src/user32

Files:

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

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.51 1999-12-24 18:51:55 sandervl Exp $
+# $Id: Makefile,v 1.52 1999-12-24 21:44:04 sandervl Exp $
 
 #
@@ -126 +126 @@
 win32wndhandle.obj: win32wndhandle.cpp win32wndhandle.h
 
-pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h dc.h
+pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h dc.h $(PDWIN32_INCLUDE)\win\thread.h
 pmframe.obj: pmframe.cpp win32class.h win32wbase.h pmframe.h win32wndchild.h
 win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h $(PDWIN32_INCLUDE)\win\winproc.h
@@ -140 +140 @@
 oslibwin.obj:   oslibwin.cpp oslibwin.h oslibutil.h oslibgdi.h $(PDWIN32_INCLUDE)\winconst.h
 oslibutil.obj:  oslibutil.cpp oslibutil.h $(PDWIN32_INCLUDE)\wprocess.h oslibmsg.h
-oslibmsg.obj:   oslibmsg.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h
-oslibmsgtranslate.obj: oslibmsgtranslate.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h
+oslibmsg.obj:   oslibmsg.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h $(PDWIN32_INCLUDE)\win\thread.h
+oslibmsgtranslate.obj: oslibmsgtranslate.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h $(PDWIN32_INCLUDE)\win\thread.h
 oslibmenu.obj:  oslibmenu.cpp oslibmenu.h
 oslibgdi.obj:   oslibgdi.cpp oslibgdi.h win32wbase.h

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.29 1999-12-24 18:39:10 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.30 1999-12-24 21:44:03 sandervl Exp $ */
 
 /*
@@ -436 +436 @@
    }
 
+   if(hWnd == 0x6800003a) {
+        hwnd = 0x6800003a; 
+   }
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
@@ -469 +472 @@
    lpps->hdc = (HDC)hps;
 
-//   if (wnd->isEraseBkgnd())
-       wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
-   wnd->setSupressErase (FALSE);
+   if(!wnd->isSuppressErase()) {
+        wnd->setSuppressErase(TRUE);
+        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
+   }
    lpps->fErase = wnd->isPSErase();
 
@@ -495 +499 @@
 BOOL WIN32API EndPaint (HWND hwnd, const PAINTSTRUCT_W *pPaint)
 {
-dprintf (("USER32: EndPaint(%x)", hwnd));
+   dprintf (("USER32: EndPaint(%x)", hwnd));
 
    if (!pPaint || !pPaint->hdc )
@@ -518 +522 @@
        O32_EndPaint (HWND_DESKTOP, pPaint);
    }
+   wnd->setSuppressErase(FALSE);
 
 exit:
@@ -869 +874 @@
       wnd->setEraseBkgnd (FALSE);
 
-   if (redraw & RDW_UPDATENOW_W)
-      wnd->setSupressErase (FALSE);
-   else if (redraw & RDW_ERASENOW_W)
-      wnd->setSupressErase (FALSE);
+//SvL: Test
+//   if (redraw & RDW_UPDATENOW_W)
+//      wnd->setSuppressErase (FALSE);
+//   else if (redraw & RDW_ERASENOW_W)
+//      wnd->setSuppressErase (FALSE);
 #if 0
    else
@@ -882 +888 @@
                 && (redraw & RDW_NOERASE_W) == 0);
 
-      wnd->setSupressErase (!erase);
+      wnd->setSuppressErase (!erase);
    }
 
@@ -982 +988 @@
       WinReleasePS (hpsTemp);
 
-   if ((redraw & RDW_INVALIDATE_W) == 0)
-      wnd->setSupressErase (FALSE);
-   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
-      wnd->setSupressErase (TRUE);
+//SvL: Test
+//   if ((redraw & RDW_INVALIDATE_W) == 0)
+//      wnd->setSuppressErase (FALSE);
+//   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
+//      wnd->setSuppressErase (TRUE);
 
    if (!success)
@@ -1383 +1390 @@
 BOOL WIN32API ValidateRect( HWND hwnd, const RECT * lprc)
 {
-    dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    if(lprc) {
+         dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    } 
+    else dprintf(("USER32: ValidateRect %x", hwnd)); 
+   
     return RedrawWindow( hwnd, lprc, 0, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.117 1999-12-24 18:39:12 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.118 1999-12-24 21:44:04 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -199 +199 @@
   EraseBkgndFlag     = TRUE;
   PSEraseFlag        = FALSE;
-  SupressEraseFlag   = FALSE;
+  SuppressEraseFlag  = FALSE;
 
   horzScrollInfo     = NULL;

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.56 1999-12-24 18:39:12 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.57 1999-12-24 21:44:04 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -376 +376 @@
          ULONG  EraseBkgndFlag:1,
                 PSEraseFlag:1,
-                SupressEraseFlag:1,
+                SuppressEraseFlag:1,
                 filler:29;
 public:
          VOID   setEraseBkgnd (BOOL erase, BOOL PSErase = FALSE)
                     { EraseBkgndFlag = erase; PSEraseFlag = PSErase; }
-         VOID   setSupressErase (BOOL erase = FALSE)
-                    { SupressEraseFlag = erase; }
+         VOID   setSuppressErase (BOOL erase = FALSE)
+                    { SuppressEraseFlag = erase; }
          BOOL   isEraseBkgnd()   { return EraseBkgndFlag; }
          BOOL   isPSErase()      { return EraseBkgndFlag | PSEraseFlag; }
-         BOOL   isSupressErase() { return SupressEraseFlag; }
+         BOOL   isSuppressErase() { return SuppressEraseFlag; }
 };
 
-#define WMMOVE_LBUTTON          1
-#define WMMOVE_MBUTTON          2
-#define WMMOVE_RBUTTON          4
-#define WMMOVE_CTRL             8
-#define WMMOVE_SHIFT            16
-
 #endif //__cplusplus