Dmitry Timoshkov : x11drv: Fix the regression caused by the recent ShowWindow fixes.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 94cc17b53ca2725505d33b5bcb0b1e1d676228de
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=94cc17b53ca2725505d33b5bcb0b1e1d676228de

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri May 19 18:55:50 2006 +0900

x11drv: Fix the regression caused by the recent ShowWindow fixes.

---

 dlls/x11drv/winpos.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index bc19aa8..aaeddd6 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -962,14 +962,15 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c
                 swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 	    break;
 
-	case SW_MINIMIZE:
 	case SW_SHOWMINNOACTIVE:
             swp |= SWP_NOACTIVATE | SWP_NOZORDER;
             /* fall through */
-	case SW_SHOWMINIMIZED:
+        case SW_MINIMIZE:
         case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */
-            swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
+            if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
             /* fall through */
+	case SW_SHOWMINIMIZED:
+            swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
             swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos );
             if (style & WS_MINIMIZE) return wasVisible;
             state_change = TRUE;
@@ -989,6 +990,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c
 	case SW_SHOW:
             if (wasVisible) return TRUE;
 	    swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE;
+            if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 	    break;
 
 	case SW_RESTORE:
@@ -1001,10 +1003,10 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c
 	case SW_SHOWNORMAL:  /* same as SW_NORMAL: */
 	case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
 	    swp |= SWP_SHOWWINDOW;
-
             if (style & (WS_MINIMIZE | WS_MAXIMIZE))
 		 swp |= WINPOS_MinMaximize( hwnd, SW_RESTORE, &newPos );
             else swp |= SWP_NOSIZE | SWP_NOMOVE;
+            if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 	    break;
     }
 
@@ -1023,12 +1025,9 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c
     }
     else
     {
-        /* ShowWindow won't activate a not being maximized child window */
         if (style & WS_CHILD)
         {
-            if (!state_change)
-                swp |= SWP_NOACTIVATE | SWP_NOZORDER;
-            else
+            if (state_change)
             {
                 /* it appears that Windows always adds an undocumented 0x8000
                  * flag if the state of a window changes.