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

Timestamp:

Apr 29, 2000, 8:28:41 PM (25 years ago)

Author:

sandervl

Message:

commented out x&y default code (no longer works), owner bugfix, level 2 debug logging

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.180 2000-04-18 11:13:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.181 2000-04-29 18:28:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -542 +542 @@
   }
 
+//SvL: This completely messes up MS Word 97 (no button bar, no menu)
+#if 0
   //adjust CW_USEDEFAULT position
   if (fXDefault | fCXDefault)
@@ -547 +549 @@
     RECT rect;
 
+    //SvL: Returns invalid rectangle (not the expected shell default size)
     OSLibWinQueryWindowRect(OS2HwndFrame,&rect,RELATIVE_TO_SCREEN);
     if (getParent()) mapWin32Rect(OSLIB_HWND_DESKTOP,getParent()->getOS2WindowHandle(),&rect);
@@ -564 +567 @@
     }
   }
+#endif
+
+  OSLibWinSetOwner(OS2Hwnd, OS2HwndFrame);
+
+  fakeWinBase.hwndThis     = OS2Hwnd;
+  fakeWinBase.pWindowClass = windowClass;
+
+  //Set icon from window or class
+  if (hIcon)
+    OSLibWinSetIcon(OS2HwndFrame,hIcon);
+  else if (windowClass->getIcon())
+    OSLibWinSetIcon(OS2HwndFrame,windowClass->getIcon());
+
+  /* Get class or window DC if needed */
+  if(windowClass->getStyle() & CS_OWNDC) {
+        dprintf(("Class with CS_OWNDC style"));
+        ownDC = GetDC(getWindowHandle()); //TODO: or GetWindowDC???
+  }
+  else
+  if (windowClass->getStyle() & CS_PARENTDC)  {
+        dprintf(("WARNING: Class with CS_PARENTDC style!"));
+        fParentDC = TRUE;
+        ownDC = 0;
+  }
+  else
+  if (windowClass->getStyle() & CS_CLASSDC)  {
+        dprintf(("WARNING: Class with CS_CLASSDC style!"));
+        ownDC = 0;
+  }
+  /* Set the window menu */
+  if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
+  {
+        if (cs->hMenu) {
+            ::SetMenu(getWindowHandle(), cs->hMenu);
+        }
+        else {
+                if (windowClass->getMenuNameA()) {
+                        cs->hMenu = LoadMenuA(windowClass->getInstance(),windowClass->getMenuNameA());
+#if 0 //CB: hack for treeview test cases bug
+if (!cs->hMenu) cs->hMenu = LoadMenuA(windowClass->getInstance(),"MYAPP");
+#endif
+                        if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
+                }
+        }
+  }
+  else
+  {
+        setWindowId((DWORD)cs->hMenu);
+  }
+  hSysMenu = (dwStyle & WS_SYSMENU) ? MENU_GetSysMenu(Win32Hwnd,0):0;
+
+  // Subclass frame
+  pOldFrameProc = FrameSubclassFrameWindow(this);
 
   /* Send the WM_GETMINMAXINFO message and fix the size if needed */
@@ -585 +641 @@
         if (cs->cy <= 0) cs->cy = 1;
   }
-
-  OSLibWinSetOwner(OS2Hwnd, OS2HwndFrame);
-
-  fakeWinBase.hwndThis     = OS2Hwnd;
-  fakeWinBase.pWindowClass = windowClass;
-
-  //Set icon from window or class
-  if (hIcon)
-    OSLibWinSetIcon(OS2HwndFrame,hIcon);
-  else if (windowClass->getIcon())
-    OSLibWinSetIcon(OS2HwndFrame,windowClass->getIcon());
-
-  /* Get class or window DC if needed */
-  if(windowClass->getStyle() & CS_OWNDC) {
-        dprintf(("Class with CS_OWNDC style"));
-        ownDC = GetDC(getWindowHandle()); //TODO: or GetWindowDC???
-  }
-  else
-  if (windowClass->getStyle() & CS_PARENTDC)  {
-        dprintf(("WARNING: Class with CS_PARENTDC style!"));
-        fParentDC = TRUE;
-        ownDC = 0;
-  }
-  else
-  if (windowClass->getStyle() & CS_CLASSDC)  {
-        dprintf(("WARNING: Class with CS_CLASSDC style!"));
-        ownDC = 0;
-  }
-  /* Set the window menu */
-  if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
-  {
-        if (cs->hMenu) {
-            ::SetMenu(getWindowHandle(), cs->hMenu);
-        }
-        else {
-                if (windowClass->getMenuNameA()) {
-                        cs->hMenu = LoadMenuA(windowClass->getInstance(),windowClass->getMenuNameA());
-#if 0 //CB: hack for treeview test cases bug
-if (!cs->hMenu) cs->hMenu = LoadMenuA(windowClass->getInstance(),"MYAPP");
-#endif
-                        if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
-                }
-        }
-  }
-  else
-  {
-        setWindowId((DWORD)cs->hMenu);
-  }
-  hSysMenu = (dwStyle & WS_SYSMENU) ? MENU_GetSysMenu(Win32Hwnd,0):0;
-
-  // Subclass frame
-  pOldFrameProc = FrameSubclassFrameWindow(this);
 
   //preset rects
@@ -1608 +1612 @@
     case WM_SYSCHAR:
     {
-            int iMenuSysKey = 0;
-            if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
+        int iMenuSysKey = 0;
+        if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
         {
                 PostMessageA(getWindowHandle(), WM_SYSCOMMAND,
@@ -1615 +1619 @@
                 break;
         }
-            if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
-        {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
-                if (wParam == VK_SPACE && (getStyle() & WS_CHILD))
-                getParent()->SendMessageA(Msg, wParam, lParam );
-                else
-                SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
-        }
-            else /* check for Ctrl-Esc */
-            if (wParam != VK_ESCAPE) MessageBeep(0);
-            break;
+        if((HIWORD(lParam) & KEYDATA_ALT) && wParam)
+        {
+                if (wParam == VK_TAB || wParam == VK_ESCAPE) 
+                        break;
+                if (wParam == VK_SPACE && (getStyle() & WS_CHILD)) {
+                        getParent()->SendMessageA(Msg, wParam, lParam );
+                }
+                else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
+        }
+        else /* check for Ctrl-Esc */
+                if (wParam != VK_ESCAPE) MessageBeep(0);
+                        break;
     }
 
@@ -2081 +2086 @@
     BOOL rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
 
+    SendInternalMessageA(WM_SHOWWINDOW, (showstate & SWPOS_SHOW) ? 1 : 0, 0);
+
     return rc;
 }