Changeset 3603 for trunk/src/user32/win32wmdichild.cpp

Timestamp:

May 24, 2000, 9:30:08 PM (25 years ago)

Author:

sandervl

Message:

experimental WM_NCHITTEST generation (disabled) + MDI fixes

File:

• trunk/src/user32/win32wmdichild.cpp (modified) (7 diffs)

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.22 2000-02-16 14:28:24 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.23 2000-05-24 19:30:08 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -99 +99 @@
 
     case WM_CHILDACTIVATE:
-        client->childActivate(this);
+        client->childActivate(this);
         return 0;
 
@@ -295 +295 @@
 
     /* this menu is needed to set a check mark in MDI_ChildActivate */
-    AppendMenuA(client->getMDIMenu(), MF_STRING ,wIDmenu, lpstrDef );
+    if(client->getMDIMenu())
+        AppendMenuA(client->getMDIMenu(), MF_STRING ,wIDmenu, lpstrDef );
 
     client->incNrActiveChildren();
@@ -347 +348 @@
     if(newchild && GetLastError() == 0)
     {
+        /* All MDI child windows have the WS_EX_MDICHILD style */
+        newchild->setExStyle(newchild->getExStyle() | WS_EX_MDICHILD);
+
         newchild->menuModifyItem();
 
@@ -363 +367 @@
              * the SWP_SHOWWINDOW command.
              */
-            newchild->SetWindowLongA(GWL_STYLE, newchild->getStyle() & ~WS_VISIBLE);
+            newchild->setStyle(newchild->getStyle() & ~WS_VISIBLE);
+
             if(showflag){
-                newchild->SetWindowPos(0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
+                dprintf(("newchild->SetWindowPos active window %x", GetActiveWindow()));
+                newchild->SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
+                dprintf(("newchild->SetWindowPos active window %x", GetActiveWindow()));
 
                 /* Set maximized state here in case hwnd didn't receive WM_SIZE
@@ -382 +389 @@
             else
                 /* needed, harmless ? */
-                newchild->SetWindowPos(0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
+                newchild->SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
 
         }
@@ -389 +396 @@
     {
         client->decNrActiveChildren();
-        DeleteMenu(client->getMDIMenu(), wIDmenu,MF_BYCOMMAND);
+        if(client->getMDIMenu()) {
+                DeleteMenu(client->getMDIMenu(), wIDmenu,MF_BYCOMMAND);
+        }
 
         maximizedChild = client->getMaximizedChild();