diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2014-05-26 14:02:30 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2014-05-27 17:47:12 +0200 |
| commit | d05a9f9a7b2371b13bf9ec766482f1bb15a3853e (patch) | |
| tree | ccd7f5092eeeba5af262d490fcbe5a3682906c09 /gtk/gtkbutton.c | |
| parent | ad6606e8af05875e60260903c071b6cc7e135194 (diff) | |
| download | gtk+-d05a9f9a7b2371b13bf9ec766482f1bb15a3853e.tar.gz | |
gesture: Replace gtk_gesture_attach/detach with event controller API
Event controllers now auto-attach, and the GtkCapturePhase only determines
when are events dispatched, but all controllers are managed by the widget wrt
grabs.
All callers have been updated.
Diffstat (limited to 'gtk/gtkbutton.c')
| -rw-r--r-- | gtk/gtkbutton.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 589b0ecb68..3e10ec64aa 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -653,7 +653,7 @@ gtk_button_init (GtkButton *button) gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->gesture), GDK_BUTTON_PRIMARY); g_signal_connect (priv->gesture, "pressed", G_CALLBACK (multipress_pressed_cb), button); g_signal_connect (priv->gesture, "released", G_CALLBACK (multipress_released_cb), button); - gtk_gesture_attach (priv->gesture, GTK_PHASE_TARGET); + gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_TARGET); } static void @@ -668,12 +668,7 @@ gtk_button_destroy (GtkWidget *widget) priv->label_text = NULL; } - if (priv->gesture) - { - gtk_gesture_detach (priv->gesture); - g_object_unref (priv->gesture); - priv->gesture = NULL; - } + g_clear_object (&priv->gesture); GTK_WIDGET_CLASS (gtk_button_parent_class)->destroy (widget); } |