Changeset 1314 for trunk/src/user32/win32wbase.cpp

Timestamp:

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

Author:

sandervl

Message:

groupbox redraw + setpos fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (6 diffs)

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,