commit e9119c198d2f2a795fa3751cb1a3f202b67bb331
author Alexandre Julliard <julliard@winehq.org> Tue Sep 24 18:36:51 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 24 18:36:51 2002 +0000
tree 79b22fad403aa5393cb235bc16f74a7f78befa6e
parent b5bb32c09a68d1e16e40e6b2a9213f8528d7b98e

Removed some more TSX11 functions and files.

dlls/x11drv/window.c

diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index 3b5a331..3f72793 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -25,7 +25,8 @@
 #include <stdlib.h>
 
 #include "ts_xlib.h"
-#include "ts_xutil.h"
+#include <X11/Xresource.h>
+#include <X11/Xutil.h>
 
 #include "winbase.h"
 #include "wingdi.h"
@@ -398,10 +399,11 @@
                          PropModeReplace, (char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) );
     }
 
+    wm_hints = XAllocWMHints();
     wine_tsx11_unlock();
 
     /* wm hints */
-    if ((wm_hints = TSXAllocWMHints()))
+    if (wm_hints)
     {
         wm_hints->flags = InputHint | StateHint | WindowGroupHint;
         wm_hints->input = !(win->dwStyle & WS_DISABLED);
@@ -1214,14 +1216,18 @@
     if (wndPtr->dwExStyle & WS_EX_MANAGED)
     {
         Window win = get_whole_window(wndPtr);
-        XWMHints* wm_hints = TSXGetWMHints( display, win );
+        XWMHints* wm_hints;
 
-        if (!wm_hints) wm_hints = TSXAllocWMHints();
+        wine_tsx11_lock();
+        if (!(wm_hints = XGetWMHints( display, win ))) wm_hints = XAllocWMHints();
+        wine_tsx11_unlock();
         if (wm_hints)
         {
             set_icon_hints( display, wndPtr, wm_hints );
-            TSXSetWMHints( display, win, wm_hints );
-            TSXFree( wm_hints );
+            wine_tsx11_lock();
+            XSetWMHints( display, win, wm_hints );
+            XFree( wm_hints );
+            wine_tsx11_unlock();
         }
     }
     WIN_ReleasePtr( wndPtr );