From: Benjamin Otte <otte@redhat.com>
Date: Fri, 3 Nov 2017 05:00:56 +0000 (+0100)
Subject: gdk: Make cursors instantiable
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~901
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d30d55be9eae94868af249e84976743a3e2e4614;p=gtk4.git

gdk: Make cursors instantiable

This way, backends can instantiate GdkCursor objects directly.

Do that for broadway to test that it indeed works.
---

diff --git a/gdk/broadway/gdkcursor-broadway.c b/gdk/broadway/gdkcursor-broadway.c
index 86911e3f40..bc6682b6d3 100644
--- a/gdk/broadway/gdkcursor-broadway.c
+++ b/gdk/broadway/gdkcursor-broadway.c
@@ -34,33 +34,6 @@
 #include "gdkprivate-broadway.h"
 #include "gdkdisplay-broadway.h"
 
-#include <string.h>
-#include <errno.h>
-
-struct _GdkBroadwayCursor
-{
-  GdkCursor cursor;
-};
-
-struct _GdkBroadwayCursorClass
-{
-  GdkCursorClass cursor_class;
-};
-
-/*** GdkBroadwayCursor ***/
-
-G_DEFINE_TYPE (GdkBroadwayCursor, gdk_broadway_cursor, GDK_TYPE_CURSOR)
-
-static void
-gdk_broadway_cursor_class_init (GdkBroadwayCursorClass *xcursor_class)
-{
-}
-
-static void
-gdk_broadway_cursor_init (GdkBroadwayCursor *cursor)
-{
-}
-
 /* Called by gdk_display_broadway_finalize to flush any cached cursors
  * for a dead display.
  */
@@ -81,32 +54,22 @@ _gdk_broadway_display_get_cursor_for_texture (GdkDisplay *display,
 					      int         x,
 					      int         y)
 {
-  GdkBroadwayCursor *private;
-  GdkCursor *cursor;
-
-  private = g_object_new (GDK_TYPE_BROADWAY_CURSOR, 
-                          "display", display,
-                          "texture", texture,
-                          "x", x,
-                          "y", y,
-                          NULL);
-  cursor = (GdkCursor *) private;
-
-  return cursor;
+  return g_object_new (GDK_TYPE_CURSOR, 
+                       "display", display,
+                       "texture", texture,
+                       "x", x,
+                       "y", y,
+                       NULL);
 }
 
 GdkCursor*
 _gdk_broadway_display_get_cursor_for_name (GdkDisplay  *display,
 					   const gchar *name)
 {
-  GdkBroadwayCursor *private;
-
-  private = g_object_new (GDK_TYPE_BROADWAY_CURSOR,
-                          "display", display,
-                          "name", name,
-                          NULL);
-
-  return GDK_CURSOR (private);
+  return g_object_new (GDK_TYPE_CURSOR,
+                       "display", display,
+                       "name", name,
+                       NULL);
 }
 
 gboolean
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index f199df8f59..7be365c48d 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -93,7 +93,7 @@ enum {
   PROP_TEXTURE,
 };
 
-G_DEFINE_ABSTRACT_TYPE (GdkCursor, gdk_cursor, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GdkCursor, gdk_cursor, G_TYPE_OBJECT)
 
 static void
 gdk_cursor_get_property (GObject    *object,