Alexandre Julliard : winex11: Make the tool window flag take precedence when setting the window type.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 66814d0dd62a39cc261cc9b1a4abe69b1d60f30f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=66814d0dd62a39cc261cc9b1a4abe69b1d60f30f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Dec 28 11:49:37 2010 +0100

winex11: Make the tool window flag take precedence when setting the window type.

This prevents some menus from being marked as dialogs.

---

 dlls/winex11.drv/window.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 3803efd..65c046b 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -1198,10 +1198,9 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data )
     else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
     else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
     else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
+    /* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */
+    else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
     else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
-#if 0  /* many window managers don't handle utility windows very well */
-    else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY);
-#endif
     else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
 
     XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),