Explicitly unregister custom wxWebViewIE namespaces when we are done with them. Also...

[wxWidgets.git] / src / x11 / utilsx.cpp

diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index 3285b0a2a4f8145ccd0ef9a7ac8c89fb7525b5c5..147915ba208b30c0acaf427cd5af14da6c2daa2c 100644 (file)
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -35,17 +35,7 @@
     #include "wx/dcmemory.h"
 #endif
 
-#ifdef HAVE_X11_XKBLIB_H
-    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
-     * field named "explicit" - which is, of course, an error for a C++
-     * compiler. To be on the safe side, just redefine it everywhere. */
-    #define explicit __wx_explicit
-
-    #include "X11/XKBlib.h"
-
-    #undef explicit
-#endif // HAVE_X11_XKBLIB_H
-
+#include "wx/x11/private/wrapxkb.h"
 
 // ----------------------------------------------------------------------------
 // XShape code