X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0492f7d97d77ec085e58d3f4a66c86508bc5f31..f377a3b58c509ceba8c9335dbe45d100cca615ad:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4a64e6a797..1675dfe547 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -18,24 +18,30 @@
 #include "wx/unix/execute.h"
 
 #include <stdarg.h>
-#include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-#include <fcntl.h>          // for O_WRONLY and friends
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <gdk/gdkx.h>
-#include "X11/XKBlib.h"
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"
+
+#ifdef HAVE_X11_XKBLIB_H
+  #ifdef __HPUX__
+    /* under HP-UX XKBlib.h defines structures with field named "explicit" -
+     * which is, of course, an error for a C++ compiler */
+    #define explicit __wx_explicit
+  #endif
+  
+  #include "X11/XKBlib.h"
+  
+  #ifdef __HPUX__
+    #undef explicit
+  #endif // __HPUX__
+#endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------
 // misc.
@@ -46,14 +52,21 @@ void wxBell()
     gdk_beep();
 }
 
-// Synthesize KeyUp events holding down a key and producing
-// KeyDown events with autorepeat.
+/* Don't synthesize KeyUp events holding down a key and producing
+   KeyDown events with autorepeat. */
+#ifdef HAVE_X11_XKBLIB_H
 bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
-    return result;       // true if keyboard hardware supports this mode
+    return result;       /* TRUE if keyboard hardware supports this mode */
+}
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
+{
+    return FALSE;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // display characterstics