diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-02-11 23:19:25 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-02-11 23:21:11 +0100 |
| commit | b1f2e5bfa315872250550593fbe8c8a00397ca31 (patch) | |
| tree | 9b7536af53574cfdf001991fdc970a9404b3fc40 | |
| parent | 63b415df92b6bf976006330ad21f0244c49bccc2 (diff) | |
| download | gtk+-b1f2e5bfa315872250550593fbe8c8a00397ca31.tar.gz | |
x11: Fix build without Xinput
Missing ifdefs
| -rw-r--r-- | gdk/x11/gdkprivate-x11.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index e70846419f..5a60f8880d 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -41,8 +41,12 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#ifdef XINPUT_XFREE #include <X11/extensions/XInput.h> +#endif +#ifdef XINPUT_XI2 #include <X11/extensions/XInput2.h> +#endif #include <cairo-xlib.h> @@ -225,6 +229,7 @@ void _gdk_x11_device_check_extension_events (GdkDevice *device); GdkDeviceManager *_gdk_x11_device_manager_new (GdkDisplay *display); +#ifdef XINPUT_XFREE void _gdk_x11_device_xi_update_window_info (GdkWindow *window); void _gdk_x11_device_xi_update_axes (GdkDevice *device, @@ -237,12 +242,15 @@ void _gdk_x11_device_xi_translate_axes (GdkDevice *device, gdouble *axes, gdouble *x, gdouble *y); +#endif +#ifdef XINPUT_XI2 guchar * _gdk_x11_device_xi2_translate_event_mask (GdkEventMask event_mask, gint *len); guint _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state, XIButtonState *buttons_state, XIGroupState *group_state); +#endif void _gdk_x11_event_translate_keyboard_string (GdkEventKey *event); |