Avoid overflowing the wake up when handling events in Unix console apps.

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 25f61e10174086c345197ad139e0bb3498e3572b..ef81b9022c06298b5d639e848bce3e37356944cc 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -272,7 +272,7 @@ static bool wxQueryWMspecSupport(Display* WXUNUSED(display),
                                  Atom (feature))
 {
     GdkAtom gatom = gdk_x11_xatom_to_atom(feature);
-    return gdk_net_wm_supports(gatom);
+    return gdk_x11_screen_supports_net_wm_hint(gdk_screen_get_default(), gatom);
 }
 #else
 static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
@@ -537,7 +537,7 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
 
 // FIXME what about tables??
 
-int wxCharCodeXToWX(KeySym keySym)
+int wxCharCodeXToWX(WXKeySym keySym)
 {
     int id;
     switch (keySym)
@@ -717,9 +717,9 @@ int wxCharCodeXToWX(KeySym keySym)
     return id;
 }
 
-KeySym wxCharCodeWXToX(int id)
+WXKeySym wxCharCodeWXToX(int id)
 {
-    KeySym keySym;
+    WXKeySym keySym;
 
     switch (id)
     {