commit 4f7abc05c2ab8dfcfd7d878774b0fd7ac3ec27f3
author Rein Klazes <rklazes@casema.net> Sat Oct 31 12:18:17 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Oct 31 12:18:17 1998 +0000
tree f51f8865ef260bbe14380e08a027b9ba8d76aa57
parent 48325f1f18dbcf9db50eecfd86a4468516e07d87

MDIchild created when the MDI client has the MDIS_ALLCHILDSTYLES
style, should not be shown at creation nor activated unless the
WS_VISIBLE flag is set.

windows/mdi.c

diff --git a/windows/mdi.c b/windows/mdi.c
index a618f7e..022d6b4 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -356,18 +356,33 @@
 	    ShowWindow32( hwnd, SW_SHOWMINNOACTIVE );
 	else
 	{
-	    SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
+            /* WS_VISIBLE is clear if a) the MDI client has
+             * MDIS_ALLCHILDSTYLES style and 2) the flag is cleared in the
+             * MDICreateStruct. If so the created window is not shown nor 
+             * activated.
+             */
+            int showflag=wnd->dwStyle & WS_VISIBLE;
+            /* clear visible flag, otherwise SetWindoPos32 ignores
+             * the SWP_SHOWWINDOW command.
+             */
+            wnd->dwStyle &= ~WS_VISIBLE;
+            if(showflag){
+                SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
 
-	    /* Set maximized state here in case hwnd didn't receive WM_SIZE
-	     * during CreateWindow - bad!
-	     */
+                /* Set maximized state here in case hwnd didn't receive WM_SIZE
+                 * during CreateWindow - bad!
+                 */
 
-            if((wnd->dwStyle & WS_MAXIMIZE) && !ci->hwndChildMaximized )
-            {
-                ci->hwndChildMaximized = wnd->hwndSelf;
-                MDI_AugmentFrameMenu( ci, w->parent, hwnd );
-                MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL ); 
-	    }
+                if((wnd->dwStyle & WS_MAXIMIZE) && !ci->hwndChildMaximized )
+                {
+                    ci->hwndChildMaximized = wnd->hwndSelf;
+                    MDI_AugmentFrameMenu( ci, w->parent, hwnd );
+                    MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL ); 
+                }
+            }else
+                /* needed, harmless ? */
+                SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
+
 	}
         TRACE(mdi, "created child - %04x\n",hwnd);
     }