t Remove gdk_cursor_new_for_display

The preferred api to create cursors is by name, and the
GdkCursorType enumeration can directly trace its ancestry
to the horrible X cursor font. So lets stop using it.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 76e35ce367723d06d195a744cdcae405b0214af3..29ee2f9342dbc490a4120642cc4a63029041a745 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -814,11 +814,9 @@ GdkCursorType
 gdk_cursor_new_from_pixbuf
 gdk_cursor_new_from_surface
 gdk_cursor_new_from_name
-gdk_cursor_new_for_display
 gdk_cursor_get_display
 gdk_cursor_get_image
 gdk_cursor_get_surface
-gdk_cursor_get_cursor_type
 
 <SUBSECTION Standard>
 GDK_TYPE_CURSOR_TYPE

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 8dabb86ee5603125441450bcc8db1f7a65205082..78db641bc63fe160f130643c2effd06602683ef4 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -358,7 +358,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
   display_class->store_clipboard = gdk_broadway_display_store_clipboard;
   display_class->supports_shapes = gdk_broadway_display_supports_shapes;
   display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes;
-  display_class->get_cursor_for_type = _gdk_broadway_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_broadway_display_get_cursor_for_name;
   display_class->get_cursor_for_surface = _gdk_broadway_display_get_cursor_for_surface;
   display_class->get_default_cursor_size = _gdk_broadway_display_get_default_cursor_size;

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 03d597bb9f59128e6aedb5f0b60e559c1d225ca7..1110efdaa7411b8c5f2239b1a3c2eb3028ea783d 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -147,44 +147,6 @@ gdk_cursor_init (GdkCursor *cursor)
 {
 }
 
-/**
- * gdk_cursor_get_cursor_type:
- * @cursor:  a #GdkCursor
- *
- * Returns the cursor type for this cursor.
- *
- * Returns: a #GdkCursorType
- *
- * Since: 2.22
- **/
-GdkCursorType
-gdk_cursor_get_cursor_type (GdkCursor *cursor)
-{
-  g_return_val_if_fail (cursor != NULL, GDK_BLANK_CURSOR);
-
-  return cursor->type;
-}
-
-/**
- * gdk_cursor_new_for_display:
- * @display: the #GdkDisplay for which the cursor will be created
- * @cursor_type: cursor to create
- *
- * Creates a new cursor from the set of builtin cursors.
- *
- * Returns: a new #GdkCursor
- *
- * Since: 2.2
- **/
-GdkCursor*
-gdk_cursor_new_for_display (GdkDisplay    *display,
-                            GdkCursorType  cursor_type)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_type (display, cursor_type);
-}
-
 /**
  * gdk_cursor_new_from_name:
  * @display: the #GdkDisplay for which the cursor will be created

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 45c68171b2029697b680f2de60622fbdf20b766d..74abbe9f676ea8f2657bd218bada35bf6935f5bd 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -221,9 +221,6 @@ typedef enum
 GDK_AVAILABLE_IN_ALL
 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_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_from_pixbuf   (GdkDisplay      *display,
                                          GdkPixbuf       *pixbuf,
@@ -245,8 +242,6 @@ GDK_AVAILABLE_IN_3_10
 cairo_surface_t *gdk_cursor_get_surface  (GdkCursor       *cursor,
                                          gdouble         *x_hot,
                                          gdouble         *y_hot);
-GDK_AVAILABLE_IN_ALL
-GdkCursorType gdk_cursor_get_cursor_type (GdkCursor       *cursor);
 
 
 G_END_DECLS

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 0215e0db2a6d812a651cebc185b9a5259276b5be..3da44a2e166546698ef3c1fd029a03e021bc9d36 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -145,8 +145,6 @@ struct _GdkDisplayClass
   void                       (*get_maximal_cursor_size) (GdkDisplay *display,
                                                          guint      *width,
                                                          guint      *height);
-  GdkCursor *                (*get_cursor_for_type)     (GdkDisplay    *display,
-                                                         GdkCursorType  type);
   GdkCursor *                (*get_cursor_for_name)     (GdkDisplay    *display,
                                                          const gchar   *name);
   GdkCursor *                (*get_cursor_for_surface)  (GdkDisplay    *display,

diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index c37a5e8ae164cf418e5c89609ebca898c98dbcef..77752accdd59b7a0f188341252efaf06a7a0881b 100644 (file)
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -272,7 +272,6 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class)
   display_class->store_clipboard = gdk_quartz_display_store_clipboard;
   display_class->supports_shapes = gdk_quartz_display_supports_shapes;
   display_class->supports_input_shapes = gdk_quartz_display_supports_input_shapes;
-  display_class->get_cursor_for_type = _gdk_quartz_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_quartz_display_get_cursor_for_name;
   display_class->get_cursor_for_surface = _gdk_quartz_display_get_cursor_for_surface;
   display_class->get_default_cursor_size = _gdk_quartz_display_get_default_cursor_size;

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 6d32361ec36cd28da120221d9fd4fdc0fbd83087..9168268062dd564758b04e5b0edd2c12082662f6 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -1036,7 +1036,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context;
   display_class->get_default_cursor_size = _gdk_wayland_display_get_default_cursor_size;
   display_class->get_maximal_cursor_size = _gdk_wayland_display_get_maximal_cursor_size;
-  display_class->get_cursor_for_type = _gdk_wayland_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_wayland_display_get_cursor_for_name;
   display_class->get_cursor_for_surface = _gdk_wayland_display_get_cursor_for_surface;
   display_class->supports_cursor_alpha = _gdk_wayland_display_supports_cursor_alpha;

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 2fd993396421a36b90856f418c26463bc5ae1b90..7af465c9d95676197c6a234866c1419082684771 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1263,7 +1263,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->supports_input_shapes = gdk_win32_display_supports_input_shapes;
 
   //? display_class->get_app_launch_context = _gdk_win32_display_get_app_launch_context;
-  display_class->get_cursor_for_type = _gdk_win32_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_win32_display_get_cursor_for_name;
   display_class->get_cursor_for_surface = _gdk_win32_display_get_cursor_for_surface;
   display_class->get_default_cursor_size = _gdk_win32_display_get_default_cursor_size;

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index c3e86a8533036a5baccf900cb888d08ec7fe5453..488854c8fa0f99b5e93c1eba087a33d400b5e258 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -237,52 +237,6 @@ get_blank_cursor (GdkDisplay *display)
   return cursor;
 }
 
-GdkCursor*
-_gdk_x11_display_get_cursor_for_type (GdkDisplay    *display,
-                                      GdkCursorType  cursor_type)
-{
-  GdkX11Cursor *private;
-  Cursor xcursor;
-
-  if (gdk_display_is_closed (display))
-    {
-      xcursor = None;
-    }
-  else
-    {
-      private = find_in_cache (display, cursor_type, NULL);
-
-      if (private)
-        {
-          /* Cache had it, add a ref for this user */
-          g_object_ref (private);
-
-          return (GdkCursor*) private;
-        }
-      else
-        {
-          if (cursor_type != GDK_BLANK_CURSOR)
-            xcursor = XCreateFontCursor (GDK_DISPLAY_XDISPLAY (display),
-                                         cursor_type);
-          else
-            xcursor = get_blank_cursor (display);
-       }
-    }
-
-  private = g_object_new (GDK_TYPE_X11_CURSOR,
-                          "cursor-type", cursor_type,
-                          "display", display,
-                          NULL);
-  private->xcursor = xcursor;
-  private->name = NULL;
-  private->serial = theme_serial;
-
-  if (xcursor != None)
-    add_to_cache (private);
-
-  return GDK_CURSOR (private);
-}
-
 /**
  * gdk_x11_cursor_get_xdisplay:
  * @cursor: (type GdkX11Cursor): a #GdkCursor.
@@ -672,11 +626,12 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay  *display,
     {
       xcursor = None;
     }
+  else if (strcmp (name, "none") == 0)
+    {
+      xcursor = get_blank_cursor (display);
+    }
   else
     {
-      if (strcmp (name, "none") == 0)
-        return _gdk_x11_display_get_cursor_for_type (display, GDK_BLANK_CURSOR);
-
       private = find_in_cache (display, GDK_CURSOR_IS_PIXMAP, name);
 
       if (private)

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index c40bc974034e1446c8d5a7950f6185f2b0c08751..c76348f98c52191e5b467106706598b474af6a2f 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -3158,7 +3158,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->supports_shapes = gdk_x11_display_supports_shapes;
   display_class->supports_input_shapes = gdk_x11_display_supports_input_shapes;
   display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;
-  display_class->get_cursor_for_type = _gdk_x11_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_x11_display_get_cursor_for_name;
   display_class->get_cursor_for_surface = _gdk_x11_display_get_cursor_for_surface;
   display_class->get_default_cursor_size = _gdk_x11_display_get_default_cursor_size;

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index d6550e710e50243c1199d2b4542e0e7ddcc007ad..c4f0e598ea3dd2f11a5e8d84670fb878190e5edc 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -230,8 +230,6 @@ GdkAtom _gdk_x11_display_manager_atom_intern   (GdkDisplayManager *manager,
 gchar * _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
                                                 GdkAtom            atom);
 
-GdkCursor *_gdk_x11_display_get_cursor_for_type     (GdkDisplay    *display,
-                                                     GdkCursorType  type);
 GdkCursor *_gdk_x11_display_get_cursor_for_name     (GdkDisplay    *display,
                                                      const gchar   *name);
 GdkCursor *_gdk_x11_display_get_cursor_for_surface  (GdkDisplay    *display,