From 02d500ac705d477cfeb5c18c743b119346b2c385 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 24 Oct 2016 09:18:53 +0200 Subject: [PATCH] cursor: Remove deprecated API --- docs/reference/gdk/gdk4-sections.txt | 3 -- gdk/gdkcursor.c | 54 ---------------------------- gdk/gdkcursor.h | 6 ---- 3 files changed, 63 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index a153e08715..801ceee98d 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -979,7 +979,6 @@ gdk_owner_change_get_type cursors GdkCursor GdkCursorType -gdk_cursor_new gdk_cursor_new_from_pixbuf gdk_cursor_new_from_surface gdk_cursor_new_from_name @@ -988,8 +987,6 @@ gdk_cursor_get_display gdk_cursor_get_image gdk_cursor_get_surface gdk_cursor_get_cursor_type -gdk_cursor_ref -gdk_cursor_unref GDK_TYPE_CURSOR_TYPE diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c index 62f1065e0f..03d597bb9f 100644 --- a/gdk/gdkcursor.c +++ b/gdk/gdkcursor.c @@ -147,60 +147,6 @@ gdk_cursor_init (GdkCursor *cursor) { } -/** - * gdk_cursor_ref: - * @cursor: a #GdkCursor - * - * Adds a reference to @cursor. - * - * Returns: (transfer full): Same @cursor that was passed in - * - * Deprecated: 3.0: Use g_object_ref() instead - */ -GdkCursor* -gdk_cursor_ref (GdkCursor *cursor) -{ - g_return_val_if_fail (cursor != NULL, NULL); - - return g_object_ref (cursor); -} - -/** - * gdk_cursor_unref: - * @cursor: a #GdkCursor - * - * Removes a reference from @cursor, deallocating the cursor - * if no references remain. - * - * Deprecated: 3.0: Use g_object_unref() instead - */ -void -gdk_cursor_unref (GdkCursor *cursor) -{ - g_return_if_fail (cursor != NULL); - - g_object_unref (cursor); -} - -/** - * gdk_cursor_new: - * @cursor_type: cursor to create - * - * Creates a new cursor from the set of builtin cursors for the default display. - * See gdk_cursor_new_for_display(). - * - * To make the cursor invisible, use %GDK_BLANK_CURSOR. - * - * Returns: a new #GdkCursor - * - * Deprecated: 3.16: Use gdk_cursor_new_for_display() instead. - */ -GdkCursor* -gdk_cursor_new (GdkCursorType cursor_type) -{ - return gdk_cursor_new_for_display (gdk_display_get_default (), cursor_type); -} - /** * gdk_cursor_get_cursor_type: * @cursor: a #GdkCursor diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index 13dbe91686..45c68171b2 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -224,8 +224,6 @@ GType gdk_cursor_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_for_display (GdkDisplay *display, GdkCursorType cursor_type); -GDK_DEPRECATED_IN_3_16 -GdkCursor* gdk_cursor_new (GdkCursorType cursor_type); GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_from_pixbuf (GdkDisplay *display, GdkPixbuf *pixbuf, @@ -241,10 +239,6 @@ GdkCursor* gdk_cursor_new_from_name (GdkDisplay *display, const gchar *name); GDK_AVAILABLE_IN_ALL GdkDisplay* gdk_cursor_get_display (GdkCursor *cursor); -GDK_DEPRECATED_IN_3_0_FOR(g_object_ref) -GdkCursor * gdk_cursor_ref (GdkCursor *cursor); -GDK_DEPRECATED_IN_3_0_FOR(g_object_unref) -void gdk_cursor_unref (GdkCursor *cursor); GDK_AVAILABLE_IN_ALL GdkPixbuf* gdk_cursor_get_image (GdkCursor *cursor); GDK_AVAILABLE_IN_3_10