Fix Bug#: 4396: floating MFC-ToolBars get managed and can't be re-docked

[Tobias Loew]

Changelog:
    dlls/x11drv/window.c

    Tobias Loew <tobi at die-loews.de>
    Fix Bug#: 4396: floating MFC-ToolBars get managed and can't be re-docked
    don't manage top-level windows having the style WS_EX_TOOLWINDOW and WS_CAPTION

Tobias Loew


Index: dlls/x11drv/window.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/window.c,v
retrieving revision 1.117
diff -u -p -r1.117 window.c
--- dlls/x11drv/window.c	30 Nov 2005 12:02:32 -0000	1.117
+++ dlls/x11drv/window.c	28 Jan 2006 10:25:55 -0000
@@ -75,10 +75,10 @@ inline static BOOL is_window_managed( HW
     /* child windows are not managed */
     style = GetWindowLongW( hwnd, GWL_STYLE );
     if (style & WS_CHILD) return FALSE;
-    /* windows with caption are managed */
-    if ((style & WS_CAPTION) == WS_CAPTION) return TRUE;
     /* tool windows are not managed  */
     if (ex_style & WS_EX_TOOLWINDOW) return FALSE;
+    /* windows with caption are managed */
+    if ((style & WS_CAPTION) == WS_CAPTION) return TRUE;
     /* windows with thick frame are managed */
     if (style & WS_THICKFRAME) return TRUE;
     /* application windows are managed */