Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 25f61e10174086c345197ad139e0bb3498e3572b..12ff73e6a390283eac6a05364fc1d4a565a22138 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon, Vaclav Slavik, Robert Roebling
 // Modified by:
 // Created:     25.03.02
 // Author:      Mattia Barbon, Vaclav Slavik, Robert Roebling
 // Modified by:
 // Created:     25.03.02

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -38,8 +37,13 @@
 
 #ifdef __WXGTK__
 #include <gdk/gdk.h>
 
 #ifdef __WXGTK__
 #include <gdk/gdk.h>

+#ifdef GDK_WINDOWING_X11

 #include <gdk/gdkx.h>
 #endif
 #include <gdk/gdkx.h>
 #endif

+#endif
+
+// Only X11 backend is supported for wxGTK here
+#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)

 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;
 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;


@@ -272,7 +276,7 @@ static bool wxQueryWMspecSupport(Display* WXUNUSED(display),
                                  Atom (feature))
 {
     GdkAtom gatom = gdk_x11_xatom_to_atom(feature);
                                  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)
 }
 #else
 static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)


@@ -537,7 +541,7 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
 
 // FIXME what about tables??
 
 
 // FIXME what about tables??
 

-int wxCharCodeXToWX(KeySym keySym)
+int wxCharCodeXToWX(WXKeySym keySym)

 {
     int id;
     switch (keySym)
 {
     int id;
     switch (keySym)


@@ -717,9 +721,9 @@ int wxCharCodeXToWX(KeySym keySym)
     return id;
 }
 
     return id;
 }
 

-KeySym wxCharCodeWXToX(int id)
+WXKeySym wxCharCodeWXToX(int id)

 {
 {

-    KeySym keySym;
+    WXKeySym keySym;

 
     switch (id)
     {
 
     switch (id)
     {


@@ -849,6 +853,8 @@ bool wxGetKeyState(wxKeyCode key)
     return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 
     return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 

+#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
+

 // ----------------------------------------------------------------------------
 // Launch document with default app
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Launch document with default app
 // ----------------------------------------------------------------------------