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

Timestamp:

Feb 5, 2000, 3:08:54 PM (26 years ago)

Author:

sandervl

Message:

set style + mdi child creation fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.151 2000-02-04 17:17:56 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.152 2000-02-05 14:08:53 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -126 +126 @@
 
   pOldFrameProc = NULL;
-  borderWidth   = 0;
-  borderHeight  = 0;
 
   hwndLinkAfter    = HWND_BOTTOM;
@@ -483 +481 @@
   }
 
-  DWORD dwOSWinStyle, dwOSFrameStyle;
-
-  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
+  DWORD dwOSWinStyle;
+
+  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle);
 
   if(HIWORD(cs->lpszName))
@@ -2733 +2731 @@
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
+                                    windowClass->getStyle() & CS_SAVEBITS);
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);
@@ -2740 +2740 @@
         case GWL_WNDPROC:
                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
-                //WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, WINPROC_GetProcType(win32wndproc), WIN_PROC_WINDOW);
                 return oldval;
+
         case GWL_HINSTANCE:
                 oldval = hInstance;
                 hInstance = value;
                 return oldval;
+
         case GWL_HWNDPARENT:
                 return SetParent((HWND)value);
+
         case GWL_ID:
                 oldval = getWindowId();
                 setWindowId(value);
                 return oldval;
+
         case GWL_USERDATA:
                 oldval = userData;
                 userData = value;
                 return oldval;
+
         default:
                 if(index >= 0 && index/4 < nrUserWindowLong)