summaryrefslogtreecommitdiff
path: root/gtk/gtktext.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-01-06 13:28:25 -0500
committerMatthias Clasen <mclasen@redhat.com>2020-01-08 18:48:21 -0500
commit38974d7d2bc56496b45e1b7406d68a37009530d7 (patch)
treef848fd3a987cdd84d0eec0953083db21d226b5a9 /gtk/gtktext.c
parentf6f331efe3f4cd7b2a0078fb6cf67d5eda6b288f (diff)
downloadgtk+-38974d7d2bc56496b45e1b7406d68a37009530d7.tar.gz
dragsource: Tweak api, update all callers
Add GdkDrag back to signals, drop ::drag-data-delete, and replace it with a boolean in ::drag-end.
Diffstat (limited to 'gtk/gtktext.c')
-rw-r--r--gtk/gtktext.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 72cf662fc6..f8959ce16d 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -2791,9 +2791,14 @@ gtk_text_motion_controller_motion (GtkEventControllerMotion *controller,
}
static void
-drag_end (GtkText *self)
+drag_end (GtkDragSource *source,
+ GdkDrag *drag,
+ gboolean delete_data,
+ GtkText *self)
{
g_object_set_data (G_OBJECT (self), "drag-source", NULL);
+ if (delete_data)
+ gtk_text_delete_selection (self);
}
static void
@@ -2848,10 +2853,7 @@ gtk_text_drag_gesture_update (GtkGestureDrag *gesture,
paintable,
priv->drag_start_x - ranges[0],
priv->drag_start_y);
- g_signal_connect_swapped (source, "drag-data-delete",
- G_CALLBACK (gtk_text_delete_selection), self);
- g_signal_connect_swapped (source, "drag-end",
- G_CALLBACK (drag_end), self);
+ g_signal_connect_swapped (source, "drag-end", G_CALLBACK (drag_end), self);
g_object_set_data_full (G_OBJECT (self), "drag-source", source, g_object_unref);
gtk_drag_source_drag_begin (source,