From f5afc17d2692e88dad66441b5ea6b46eb43d40f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 23 Feb 2018 16:18:11 +0100 Subject: [PATCH] button: Remove ::event handler GRAB_BROKEN events cause the ::cancel handler of the gesture to be emitted, which is where we also call gtk_button_do_release, so this GtkWidget::event handler is unnecessary. --- gtk/gtkbutton.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index d2326db490..5c4ba4308a 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -122,8 +122,6 @@ static void gtk_button_get_property (GObject *object, static void gtk_button_display_changed (GtkWidget *widget, GdkDisplay *previous_display); static void gtk_button_unrealize (GtkWidget * widget); -static gboolean gtk_button_event (GtkWidget *widget, - GdkEvent *event); static gint gtk_button_key_release (GtkWidget * widget, GdkEventKey * event); static void gtk_real_button_clicked (GtkButton * button); static void gtk_real_button_activate (GtkButton *button); @@ -205,7 +203,6 @@ gtk_button_class_init (GtkButtonClass *klass) widget_class->measure = gtk_button_measure_; widget_class->display_changed = gtk_button_display_changed; widget_class->unrealize = gtk_button_unrealize; - widget_class->event = gtk_button_event; widget_class->key_release_event = gtk_button_key_release; widget_class->state_flags_changed = gtk_button_state_flags_changed; widget_class->grab_notify = gtk_button_grab_notify; @@ -757,21 +754,6 @@ gtk_button_do_release (GtkButton *button, } } -static gboolean -gtk_button_event (GtkWidget *widget, - GdkEvent *event) -{ - GtkButton *button = GTK_BUTTON (widget); - - if (gdk_event_get_event_type (event) == GDK_GRAB_BROKEN) - { - gtk_button_do_release (button, FALSE); - return GDK_EVENT_STOP; - } - - return GDK_EVENT_PROPAGATE; -} - static gboolean gtk_button_key_release (GtkWidget *widget, GdkEventKey *event)