diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-09 06:14:59 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-04-26 17:59:42 +0200 |
| commit | 4ddc94b293504b56c0106b0177c36c8efd2d3a57 (patch) | |
| tree | b620c608c025e287685a04afa8429d5541e12274 /gtk/gtktextview.c | |
| parent | 71991270b047c66e7c14a65aaa70703527c978cf (diff) | |
| download | gtk+-4ddc94b293504b56c0106b0177c36c8efd2d3a57.tar.gz | |
multipressgesture: Port to new API model
Diffstat (limited to 'gtk/gtktextview.c')
| -rw-r--r-- | gtk/gtktextview.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 193c9a9794..c50fe411f7 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -224,7 +224,6 @@ struct _GtkTextViewPrivate GtkTextPendingScroll *pending_scroll; - GtkGesture *multipress_gesture; GtkGesture *drag_gesture; GtkEventController *motion_controller; GtkEventController *key_controller; @@ -1617,6 +1616,7 @@ gtk_text_view_init (GtkTextView *text_view) GdkContentFormats *target_list; GtkTextViewPrivate *priv; GtkStyleContext *context; + GtkGesture *gesture; text_view->priv = gtk_text_view_get_instance_private (text_view); priv = text_view->priv; @@ -1671,11 +1671,12 @@ gtk_text_view_init (GtkTextView *text_view) priv->text_window = text_window_new (GTK_TEXT_WINDOW_TEXT, widget); - priv->multipress_gesture = gtk_gesture_multi_press_new (widget); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0); - g_signal_connect (priv->multipress_gesture, "pressed", + gesture = gtk_gesture_multi_press_new (); + gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0); + g_signal_connect (gesture, "pressed", G_CALLBACK (gtk_text_view_multipress_gesture_pressed), widget); + gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture)); priv->drag_gesture = gtk_gesture_drag_new (widget); g_signal_connect (priv->drag_gesture, "drag-update", @@ -3599,7 +3600,6 @@ gtk_text_view_finalize (GObject *object) cancel_pending_scroll (text_view); - g_object_unref (priv->multipress_gesture); g_object_unref (priv->drag_gesture); g_object_unref (priv->motion_controller); g_object_unref (priv->key_controller); @@ -5121,7 +5121,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture, with the middle button */ priv->scroll_after_paste = FALSE; - get_iter_from_gesture (text_view, priv->multipress_gesture, + get_iter_from_gesture (text_view, GTK_GESTURE (gesture), &iter, NULL, NULL); gtk_text_buffer_paste_clipboard (get_buffer (text_view), gtk_widget_get_primary_clipboard (GTK_WIDGET (text_view)), @@ -5153,7 +5153,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture, if (is_touchscreen) handle_mode = GTK_TEXT_HANDLE_MODE_CURSOR; - get_iter_from_gesture (text_view, priv->multipress_gesture, + get_iter_from_gesture (text_view, GTK_GESTURE (gesture), &iter, NULL, NULL); if (gtk_text_buffer_get_selection_bounds (get_buffer (text_view), @@ -5208,7 +5208,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture, } gtk_text_view_end_selection_drag (text_view); - get_iter_from_gesture (text_view, priv->multipress_gesture, + get_iter_from_gesture (text_view, GTK_GESTURE (gesture), &iter, NULL, NULL); gtk_text_view_start_selection_drag (text_view, &iter, n_press == 2 ? SELECT_WORDS : SELECT_LINES, |