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

Timestamp:

Jun 14, 2001, 1:30:57 PM (24 years ago)

Author:

sandervl

Message:

dispatch untranslated msgs + frame control button changes (manually change restore/min/max)

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.268 2001-06-13 17:28:07 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.269 2001-06-14 11:30:56 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -140 +140 @@
   dwExStyle        = 0;
   dwStyle          = 0;
+  dwOldStyle       = 0;
   win32wndproc     = 0;
   hInstance        = 0;
@@ -453 +454 @@
 
     WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc(), WINPROC_GetProcType(windowClass->getWindowProc()), WIN_PROC_WINDOW);
-    hInstance = cs->hInstance;
-    dwStyle   = cs->style & ~WS_VISIBLE;
-    dwExStyle = cs->dwExStyle;
+    hInstance  = cs->hInstance;
+    dwStyle    = cs->style & ~WS_VISIBLE;
+    dwOldStyle = dwStyle;
+    dwExStyle  = cs->dwExStyle;
 
     hwndLinkAfter = ((cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) ? HWND_BOTTOM : HWND_TOP;
@@ -2262 +2264 @@
     wasVisible = (getStyle() & WS_VISIBLE) != 0;
 
+    dwOldStyle = getStyle();
+
     switch(nCmdShow)
     {
@@ -2318 +2322 @@
     case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
     case SW_RESTORE:
-         //TODO: WIN_RESTORE_MAX flag!!!!!!!!!!!!!!
          swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
 
@@ -2485 +2488 @@
     if(getParent()) {
           OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, getParent()->getClientHeight(),
-                                      OS2HwndFrame);
+                                 OS2HwndFrame);
     }
     else  OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, OSLibQueryScreenHeight(), OS2HwndFrame);