diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
| commit | bd4609b14042a91646cd9057764eecfbc6faf42b (patch) | |
| tree | 8721405d2b45a998f87cccc672b4070780907fb8 /gdk/gdk.h | |
| parent | a538f639b69a39d7bb85b39af2dfd296d28fc0aa (diff) | |
| download | gtk+-bd4609b14042a91646cd9057764eecfbc6faf42b.tar.gz | |
Merge the xi2-for-master branch
Diffstat (limited to 'gdk/gdk.h')
| -rw-r--r-- | gdk/gdk.h | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -33,6 +33,8 @@ #include <gdk/gdkcairo.h> #include <gdk/gdkcolor.h> #include <gdk/gdkcursor.h> +#include <gdk/gdkdevice.h> +#include <gdk/gdkdevicemanager.h> #include <gdk/gdkdisplay.h> #include <gdk/gdkdisplaymanager.h> #include <gdk/gdkdnd.h> @@ -66,6 +68,7 @@ G_BEGIN_DECLS /* Initialization, exit and events */ #define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT) +void gdk_enable_multidevice (void); void gdk_parse_args (gint *argc, gchar ***argv); void gdk_init (gint *argc, @@ -109,6 +112,7 @@ gint gdk_input_add (gint source, void gdk_input_remove (gint tag); #endif /* GDK_DISABLE_DEPRECATED */ +#ifndef GDK_MULTIDEVICE_SAFE GdkGrabStatus gdk_pointer_grab (GdkWindow *window, gboolean owner_events, GdkEventMask event_mask, @@ -118,18 +122,15 @@ GdkGrabStatus gdk_pointer_grab (GdkWindow *window, GdkGrabStatus gdk_keyboard_grab (GdkWindow *window, gboolean owner_events, guint32 time_); - -gboolean gdk_pointer_grab_info_libgtk_only (GdkDisplay *display, - GdkWindow **grab_window, - gboolean *owner_events); -gboolean gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display, - GdkWindow **grab_window, - gboolean *owner_events); +#endif /* GDK_MULTIDEVICE_SAFE */ #ifndef GDK_MULTIHEAD_SAFE + +#ifndef GDK_MULTIDEVICE_SAFE void gdk_pointer_ungrab (guint32 time_); void gdk_keyboard_ungrab (guint32 time_); gboolean gdk_pointer_is_grabbed (void); +#endif /* GDK_MULTIDEVICE_SAFE */ gint gdk_screen_width (void) G_GNUC_CONST; gint gdk_screen_height (void) G_GNUC_CONST; |