summaryrefslogtreecommitdiff
path: root/gdk/gdkdisplay.h
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/gdkdisplay.h')
-rw-r--r--gdk/gdkdisplay.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 58704fbee3..e2231310d6 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -53,11 +53,14 @@ GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
+GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_display_pointer_ungrab (GdkDisplay *display,
- guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
+ guint32 time_);
+GDK_DEPRECATED_FOR(gdk_device_ungrab)
void gdk_display_keyboard_ungrab (GdkDisplay *display,
- guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
-gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_display_device_is_grabbed);
+ guint32 time_);
+GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
+gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
@@ -71,7 +74,8 @@ void gdk_display_close (GdkDisplay *display);
gboolean gdk_display_is_closed (GdkDisplay *display);
#ifndef GDK_DISABLE_DEPRECATED
-GList * gdk_display_list_devices (GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_device_manager_list_devices);
+GDK_DEPRECATED_FOR(gdk_device_manager_list_devices)
+GList * gdk_display_list_devices (GdkDisplay *display);
#endif /* GDK_DISABLE_DEPRECATED */
GdkEvent* gdk_display_get_event (GdkDisplay *display);
@@ -89,18 +93,21 @@ GdkDisplay *gdk_display_get_default (void);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
+GDK_DEPRECATED_FOR(gdk_device_get_position)
void gdk_display_get_pointer (GdkDisplay *display,
GdkScreen **screen,
gint *x,
gint *y,
- GdkModifierType *mask) G_GNUC_DEPRECATED_FOR(gdk_device_get_position);
+ GdkModifierType *mask);
+GDK_DEPRECATED_FOR(gdk_device_get_window_at_position)
GdkWindow * gdk_display_get_window_at_pointer (GdkDisplay *display,
gint *win_x,
- gint *win_y) G_GNUC_DEPRECATED_FOR(gdk_device_get_window_at_position);
+ gint *win_y);
+GDK_DEPRECATED_FOR(gdk_device_warp)
void gdk_display_warp_pointer (GdkDisplay *display,
GdkScreen *screen,
gint x,
- gint y) G_GNUC_DEPRECATED_FOR(gdk_device_warp);
+ gint y);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */