Changeset 1314 for trunk/src

Timestamp:

Oct 16, 1999, 12:28:31 PM (26 years ago)

Author:

sandervl

Message:

groupbox redraw + setpos fixes

Location:

trunk/src/user32

Files:

• button.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (6 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.9 1999-10-12 18:14:53 sandervl Exp $ */
+/* $Id: button.cpp,v 1.10 1999-10-16 10:28:30 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -163 +163 @@
 static LRESULT BUTTON_EraseBkgnd(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
-  return 1;
+  //SvL: Erase background for groupboxes as the paint function only draws
+  //     a box
+  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
+//  if(style == BS_GROUPBOX) {
+        return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
+//  }
+//  return 1;
 }
 
@@ -1065 +1071 @@
     wndClass.cbWndExtra    = sizeof(BUTTONINFO);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)0;
+//    wndClass.hbrBackground = (HBRUSH)0;
+    wndClass.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
     wndClass.lpszClassName = BUTTONCLASSNAME;
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.30 1999-10-15 13:52:54 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.31 1999-10-16 10:28:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -257 +257 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
+        if (!win32wnd->CanReceiveSizeMsgs())    break;
 
         WinQueryWindowPos(hwnd, &swpOld);
@@ -296 +297 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
+        if (!win32wnd->CanReceiveSizeMsgs())    break;
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
@@ -394 +396 @@
     goto RunDefWndProc;
 //        break;
-    }
-
-    case WM_ERASEBACKGROUND:
-    {
-        dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
-        if (!win32wnd->isSupressErase()) {
-            BOOL erased = sendEraseBkgnd (win32wnd);
-            win32wnd->setEraseBkgnd (!erased, !erased);
-        }
-        break;
     }
 
@@ -851 +843 @@
     }
 
+    case WM_ERASEBACKGROUND:
+    {
+        dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
+        if (!win32wnd->isSupressErase()) {
+            BOOL erased = sendEraseBkgnd (win32wnd);
+            win32wnd->setEraseBkgnd (!erased, !erased);
+        }
+        break;
+    }
+
     case WM_PAINT:
         dprintf(("OS2: WM_PAINT %x", hwnd));
 
+#if 0
         if (WinQueryUpdateRect (hwnd, NULL)) {
             if (!win32wnd->isSupressErase()) {
@@ -861 +864 @@
         }
         win32wnd->setSupressErase (FALSE);
-
+#endif
         if(win32wnd->MsgPaint(0, 0)) {
                 goto RunDefWndProc;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.45 1999-10-15 13:52:54 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.46 1999-10-16 10:28:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -258 +258 @@
         return 0;
   }
+#ifdef DEBUG
+  if(HIWORD(cs->lpszClass))
+  {
+        char *astring;
+
+        if(isUnicode) astring = UnicodeToAsciiString((LPWSTR)cs->lpszClass);
+        else          astring = (char *)cs->lpszClass;
+
+        dprintf(("Window class %s", astring));
+        if(isUnicode) FreeAsciiString(astring);
+  }
+  else  dprintf(("Window class %x", cs->lpszClass));
+#endif
 
   /* Fix the lpszClass field: from existing programs, it seems ok to call a CreateWindowXXX
@@ -519 +532 @@
 //        OS2HwndFrame = hwndClient;
 
+  fNoSizeMsg = TRUE;
+
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
         dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2Hwnd));
@@ -573 +588 @@
 //  SetFakeOpen32();
 
+  //Set icon from class
+  if(windowClass->getIcon())
+        SetIcon(windowClass->getIcon());
+
   /* Set the window menu */
   if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
@@ -589 +608 @@
         setWindowId((DWORD)cs->hMenu);
   }
-
-  //Set icon from class
-  if(windowClass->getIcon())
-        SetIcon(windowClass->getIcon());
 
   //Subclass frame
@@ -608 +623 @@
   maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
 
-  fNoSizeMsg = TRUE;
   if(getParent()) {
         SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.23 1999-10-15 13:52:55 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.24 1999-10-16 10:28:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -163 +163 @@
          BOOL   IsDialog()                    { return fIsDialog; };
 
+         BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
          BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
          BOOL   IsWindowEnabled();