From: Benjamin Otte <otte@redhat.com>
Date: Sun, 18 Feb 2018 04:27:59 +0000 (+0100)
Subject: dnd: Make dnd icon API take a paintable
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~947
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89ee42db54668af7e5389c8a16adef0990b3e21d;p=gtk4.git

dnd: Make dnd icon API take a paintable

... instead of a texture.
---

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 4615cdc0c6..5196b316fe 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -127,7 +127,10 @@ drag_begin (GtkWidget      *widget,
 
   texture = get_image_texture (GTK_IMAGE (widget));
   if (texture)
-    gtk_drag_set_icon_texture (context, texture, -2, -2);
+    {
+      gtk_drag_set_icon_paintable (context, GDK_PAINTABLE (texture), -2, -2);
+      g_object_unref (texture);
+    }
 }
 
 void
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 64f11cb4c3..f1a23656d7 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4993,7 +4993,7 @@ gtk_drag_begin_with_coordinates
 gtk_drag_cancel
 gtk_drag_set_icon_widget
 gtk_drag_set_icon_surface
-gtk_drag_set_icon_texture
+gtk_drag_set_icon_paintable
 gtk_drag_set_icon_name
 gtk_drag_set_icon_gicon
 gtk_drag_set_icon_default
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index f621070850..ef96eeda95 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1208,10 +1208,10 @@ gtk_drag_set_icon_surface (GdkDragContext  *context,
 }
 
 /**
- * gtk_drag_set_icon_texture:
+ * gtk_drag_set_icon_paintable:
  * @context: the context for a drag (This must be called
  *     with a context for the source side of a drag)
- * @texture: the #GdkTexture to use as icon
+ * @paintable: the #GdkPaintable to use as icon
  * @hot_x: the X offset of the hotspot within the icon
  * @hot_y: the Y offset of the hotspot within the icon
  *
@@ -1224,17 +1224,17 @@ gtk_drag_set_icon_surface (GdkDragContext  *context,
  * mouse cursor.
  */
 void
-gtk_drag_set_icon_texture (GdkDragContext *context,
-                           GdkTexture     *texture,
-                           int             hot_x,
-                           int             hot_y)
+gtk_drag_set_icon_paintable (GdkDragContext *context,
+                             GdkPaintable   *paintable,
+                             int             hot_x,
+                             int             hot_y)
 {
   GtkWidget *widget;
 
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-  g_return_if_fail (GDK_IS_TEXTURE (texture));
+  g_return_if_fail (GDK_IS_PAINTABLE (paintable));
 
-  widget = gtk_image_new_from_texture (texture);
+  widget = gtk_image_new_from_paintable (paintable);
 
   gtk_drag_set_icon_widget_internal (context, widget, hot_x, hot_y, TRUE);
 }
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 50f7270a65..58b2aca5f9 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -79,8 +79,8 @@ GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_surface(GdkDragContext *context,
 			       cairo_surface_t *surface);
 GDK_AVAILABLE_IN_ALL
-void gtk_drag_set_icon_texture(GdkDragContext *context,
-			       GdkTexture     *texture,
+void gtk_drag_set_icon_paintable (GdkDragContext *context,
+			       GdkPaintable   *paintable,
                                int             hot_x,
                                int             hot_y);
 GDK_AVAILABLE_IN_ALL