From 75df35298c373fb8e40e9a4fce72619bb7bc72a6 Mon Sep 17 00:00:00 2001
From: Mat <mail@mathias.is>
Date: Thu, 1 Feb 2024 01:22:05 +0200
Subject: [PATCH] Replace some instances of outdated cursor types

Use the CSS cursor names instead.
---
 gtk/deprecated/gtkhandlebox.c | 4 ++--
 gtk/deprecated/gtkhsv.c       | 4 ++--
 gtk/gtklabel.c                | 4 ++--
 tests/testgtk.c               | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gtk/deprecated/gtkhandlebox.c b/gtk/deprecated/gtkhandlebox.c
index cb1d12ca2b..18ea3ad5b2 100644
--- a/gtk/deprecated/gtkhandlebox.c
+++ b/gtk/deprecated/gtkhandlebox.c
@@ -1297,8 +1297,8 @@ gtk_handle_box_button_press (GtkWidget      *widget,
 		}
 	      priv->in_drag = TRUE;
               priv->grab_device = event->device;
-	      fleur = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
-						  GDK_FLEUR);
+	      fleur = gdk_cursor_new_from_name (gtk_widget_get_display (widget),
+					        "move");
 	      if (gdk_device_grab (event->device,
                                    gtk_widget_get_window (invisible),
                                    GDK_OWNERSHIP_WINDOW,
diff --git a/gtk/deprecated/gtkhsv.c b/gtk/deprecated/gtkhsv.c
index 6e30d5e43f..8c452cf6f6 100644
--- a/gtk/deprecated/gtkhsv.c
+++ b/gtk/deprecated/gtkhsv.c
@@ -616,8 +616,8 @@ set_cross_grab (GtkHSV    *hsv,
   GtkHSVPrivate *priv = hsv->priv;
   GdkCursor *cursor;
 
-  cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (hsv)),
-                                       GDK_CROSSHAIR);
+  cursor = gdk_cursor_new_from_name (gtk_widget_get_display (GTK_WIDGET (hsv)),
+                                     "crosshair");
   gdk_device_grab (device,
                    priv->window,
                    GDK_OWNERSHIP_NONE,
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 8ba764cf01..fdef14b2c0 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -5455,8 +5455,8 @@ gtk_label_create_window (GtkLabel *label)
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
   if (gtk_widget_is_sensitive (widget) && priv->select_info->selectable)
     {
-      attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
-						      GDK_XTERM);
+      attributes.cursor = gdk_cursor_new_from_name (gtk_widget_get_display (widget),
+						    "text");
       attributes_mask |= GDK_WA_CURSOR;
     }
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index c140400e68..b9456990af 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4928,7 +4928,7 @@ set_cursor_from_name (GtkWidget *entry,
   if (cursor == NULL)
     {
       name = NULL;
-      cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_BLANK_CURSOR);
+      cursor = gdk_cursor_new_from_name (gtk_widget_get_display (widget), "none");
     }
 
   gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
@@ -8635,8 +8635,8 @@ snapshot_widget (GtkButton *button,
   data->is_toplevel = widget == data->toplevel_button;
 
   if (!data->cursor)
-    data->cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
-					       GDK_TARGET);
+    data->cursor = gdk_cursor_new_from_name (gtk_widget_get_display (widget),
+					     "crosshair");
 
   gdk_seat_grab (gdk_device_get_seat (device),
                  gtk_widget_get_window (widget),