X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..9b73db3c34aefd98080b425459322fa821ae271f:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index c8837d8f2e..1675dfe547 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -18,31 +18,30 @@ #include "wx/unix/execute.h" #include -#include #include #include #include #include -#include -#include -#include -#include -#include -#include // for O_WRONLY and friends - -#include -#include -#include -#include -#include - -#ifdef __HPUX__ - // under HP-UX XKBlib.h defines structures with field named "explicit" - - // which is, of course, an error for a C++ compiler + +#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 - #include "X11/XKBlib.h" + #endif + + #include "X11/XKBlib.h" + + #ifdef __HPUX__ #undef explicit -#endif // __HPUX__ + #endif // __HPUX__ +#endif // HAVE_X11_XKBLIB_H // ---------------------------------------------------------------------------- // misc. @@ -53,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