gdk: Use versioned deprecations

[~andy/gtk] / gdk / gdkdisplay.h

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 9f24d038aff72c052b5f7efa8a124bdf5b1aae1a..14f5fa6713816ac6d7b87579e239bcd9ddb4cfba 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -28,6 +28,7 @@
 #ifndef __GDK_DISPLAY_H__
 #define __GDK_DISPLAY_H__
 
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkdevicemanager.h>
@@ -52,13 +53,13 @@ GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
 GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
 
 #ifndef GDK_MULTIDEVICE_SAFE
-GDK_DEPRECATED_FOR(gdk_device_ungrab)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
                                             guint32      time_);
-GDK_DEPRECATED_FOR(gdk_device_ungrab)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
                                             guint32      time_);
-GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed)
 gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
@@ -71,7 +72,7 @@ void        gdk_display_flush              (GdkDisplay  *display);
 void        gdk_display_close                  (GdkDisplay  *display);
 gboolean    gdk_display_is_closed          (GdkDisplay  *display);
 
-GDK_DEPRECATED_FOR(gdk_device_manager_list_devices)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_manager_list_devices)
 GList *     gdk_display_list_devices       (GdkDisplay  *display);
 
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
@@ -88,17 +89,17 @@ void gdk_display_set_double_click_distance (GdkDisplay   *display,
 GdkDisplay *gdk_display_get_default (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
-GDK_DEPRECATED_FOR(gdk_device_get_position)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_get_position)
 void             gdk_display_get_pointer           (GdkDisplay             *display,
                                                     GdkScreen             **screen,
                                                     gint                   *x,
                                                     gint                   *y,
                                                     GdkModifierType        *mask);
-GDK_DEPRECATED_FOR(gdk_device_get_window_at_position)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_get_window_at_position)
 GdkWindow *      gdk_display_get_window_at_pointer (GdkDisplay             *display,
                                                     gint                   *win_x,
                                                     gint                   *win_y);
-GDK_DEPRECATED_FOR(gdk_device_warp)
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_warp)
 void             gdk_display_warp_pointer          (GdkDisplay             *display,
                                                     GdkScreen              *screen,
                                                     gint                   x,