[gtk+] Add G_GNUC_DEPRECATED annotations in GDK
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Add G_GNUC_DEPRECATED annotations in GDK
- Date: Sun, 9 Oct 2011 13:55:48 +0000 (UTC)
commit a35d8764da6d3a1b3118e2ec2e7816395f95d2d2
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Oct 9 09:55:08 2011 -0400
Add G_GNUC_DEPRECATED annotations in GDK
gdk/gdkapplaunchcontext.h | 6 +++---
gdk/gdkcursor.h | 4 ++--
gdk/gdkdisplay.h | 14 +++++++-------
gdk/gdkmain.h | 20 ++++++++++----------
gdk/gdkwindow.h | 10 +++++-----
5 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 96aeeba..5f968c9 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -35,15 +35,15 @@ G_BEGIN_DECLS
#define GDK_TYPE_APP_LAUNCH_CONTEXT (gdk_app_launch_context_get_type ())
#define GDK_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContext))
-#define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
+ #define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
GType gdk_app_launch_context_get_type (void);
#ifndef GDK_DISABLE_DEPRECATED
-GdkAppLaunchContext *gdk_app_launch_context_new (void);
+GdkAppLaunchContext *gdk_app_launch_context_new (void) G_GNUC_DEPRECATED_FOR(gdk_display_get_app_launch_context);
void gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
- GdkDisplay *display);
+ GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_display_get_app_launch_context);
#endif
void gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
GdkScreen *screen);
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 89b0ef1..00fee6e 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -229,8 +229,8 @@ GdkCursor* gdk_cursor_new_from_name (GdkDisplay *display,
const gchar *name);
GdkDisplay* gdk_cursor_get_display (GdkCursor *cursor);
#ifndef GDK_DISABLE_DEPRECATED
-GdkCursor* gdk_cursor_ref (GdkCursor *cursor);
-void gdk_cursor_unref (GdkCursor *cursor);
+GdkCursor* gdk_cursor_ref (GdkCursor *cursor) G_GNUC_DEPRECATED_FOR(g_object_ref);
+void gdk_cursor_unref (GdkCursor *cursor) G_GNUC_DEPRECATED_FOR(g_object_unref);
#endif
GdkPixbuf* gdk_cursor_get_image (GdkCursor *cursor);
GdkCursorType gdk_cursor_get_cursor_type (GdkCursor *cursor);
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 3c4179e..58704fb 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -54,10 +54,10 @@ GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
void gdk_display_pointer_ungrab (GdkDisplay *display,
- guint32 time_);
+ guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
void gdk_display_keyboard_ungrab (GdkDisplay *display,
- guint32 time_);
-gboolean gdk_display_pointer_is_grabbed (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);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
@@ -71,7 +71,7 @@ void gdk_display_close (GdkDisplay *display);
gboolean gdk_display_is_closed (GdkDisplay *display);
#ifndef GDK_DISABLE_DEPRECATED
-GList * gdk_display_list_devices (GdkDisplay *display);
+GList * gdk_display_list_devices (GdkDisplay *display) G_GNUC_DEPRECATED_FOR(gdk_device_manager_list_devices);
#endif /* GDK_DISABLE_DEPRECATED */
GdkEvent* gdk_display_get_event (GdkDisplay *display);
@@ -93,14 +93,14 @@ void gdk_display_get_pointer (GdkDisplay *disp
GdkScreen **screen,
gint *x,
gint *y,
- GdkModifierType *mask);
+ GdkModifierType *mask) G_GNUC_DEPRECATED_FOR(gdk_device_get_position);
GdkWindow * gdk_display_get_window_at_pointer (GdkDisplay *display,
gint *win_x,
- gint *win_y);
+ gint *win_y) G_GNUC_DEPRECATED_FOR(gdk_device_get_window_at_position);
void gdk_display_warp_pointer (GdkDisplay *display,
GdkScreen *screen,
gint x,
- gint y);
+ gint y) G_GNUC_DEPRECATED_FOR(gdk_device_warp);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 411b58f..c71d09e 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -80,14 +80,14 @@ gchar* gdk_get_display (void);
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
- gboolean owner_events,
- GdkEventMask event_mask,
- GdkWindow *confine_to,
- GdkCursor *cursor,
- guint32 time_);
+ gboolean owner_events,
+ GdkEventMask event_mask,
+ GdkWindow *confine_to,
+ GdkCursor *cursor,
+ guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_grab);
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
- gboolean owner_events,
- guint32 time_);
+ gboolean owner_events,
+ guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_grab);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
@@ -95,9 +95,9 @@ GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
#ifndef GDK_MULTIDEVICE_SAFE
#ifndef GDK_DISABLE_DEPRECATED
-void gdk_pointer_ungrab (guint32 time_);
-void gdk_keyboard_ungrab (guint32 time_);
-gboolean gdk_pointer_is_grabbed (void);
+void gdk_pointer_ungrab (guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
+void gdk_keyboard_ungrab (guint32 time_) G_GNUC_DEPRECATED_FOR(gdk_device_ungrab);
+gboolean gdk_pointer_is_grabbed (void) G_GNUC_DEPRECATED_FOR(gdk_display_device_is_grabbed);
#endif /* GDK_DISABLE_DEPRECATED */
#endif /* GDK_MULTIDEVICE_SAFE */
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index b400ee4..3b6f05c 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -504,7 +504,7 @@ GdkScreen * gdk_window_get_screen (GdkWindow *window);
GdkDisplay * gdk_window_get_display (GdkWindow *window);
#ifndef GDK_MULTIDEVICE_SAFE
GdkWindow* gdk_window_at_pointer (gint *win_x,
- gint *win_y);
+ gint *win_y) G_GNUC_DEPRECATED_FOR(gdk_device_get_window_at_position);
#endif /* GDK_MULTIDEVICE_SAFE */
void gdk_window_show (GdkWindow *window);
void gdk_window_hide (GdkWindow *window);
@@ -710,10 +710,10 @@ void gdk_window_get_frame_extents (GdkWindow *window,
GdkRectangle *rect);
#ifndef GDK_MULTIDEVICE_SAFE
-GdkWindow* gdk_window_get_pointer (GdkWindow *window,
- gint *x,
- gint *y,
- GdkModifierType *mask);
+GdkWindow * gdk_window_get_pointer (GdkWindow *window,
+ gint *x,
+ gint *y,
+ GdkModifierType *mask) G_GNUC_DEPRECATED_FOR(gdk_window_get_device_position);
#endif /* GDK_MULTIDEVICE_SAFE */
GdkWindow * gdk_window_get_device_position (GdkWindow *window,
GdkDevice *device,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
