From 1c9fbe37734a16ac86791b1955127b2f859ff65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 13 Aug 2019 12:10:43 +0200 Subject: [PATCH] widget: Remove captured event handler code --- gtk/gtkwidget.c | 19 ------------------- gtk/gtkwidgetprivate.h | 5 ----- 2 files changed, 24 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index a27db2b938..f8060611d1 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -5176,13 +5176,6 @@ gtk_widget_event (GtkWidget *widget, return gtk_widget_event_internal (widget, event); } -void -_gtk_widget_set_captured_event_handler (GtkWidget *widget, - GtkCapturedEventHandler callback) -{ - g_object_set_data (G_OBJECT (widget), I_("captured-event-handler"), callback); -} - gboolean gtk_widget_run_controllers (GtkWidget *widget, const GdkEvent *event, @@ -5242,7 +5235,6 @@ _gtk_widget_captured_event (GtkWidget *widget, const GdkEvent *event) { gboolean return_val = FALSE; - GtkCapturedEventHandler handler; GdkEvent *event_copy; g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE); @@ -5255,19 +5247,8 @@ _gtk_widget_captured_event (GtkWidget *widget, translate_event_coordinates (event_copy, widget); return_val = gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_CAPTURE); - - handler = g_object_get_data (G_OBJECT (widget), I_("captured-event-handler")); - if (!handler) - goto out; - - g_object_ref (widget); - - return_val |= handler (widget, event_copy); return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event_copy); - g_object_unref (widget); - -out: g_object_unref (event_copy); return return_val; diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h index 26df307cc2..c724af58e0 100644 --- a/gtk/gtkwidgetprivate.h +++ b/gtk/gtkwidgetprivate.h @@ -281,11 +281,6 @@ void _gtk_widget_buildable_finish_accelerator (GtkWidget *widget, gpointer user_data); GtkStyleContext * _gtk_widget_peek_style_context (GtkWidget *widget); -typedef gboolean (*GtkCapturedEventHandler) (GtkWidget *widget, GdkEvent *event); - -void _gtk_widget_set_captured_event_handler (GtkWidget *widget, - GtkCapturedEventHandler handler); - gboolean _gtk_widget_captured_event (GtkWidget *widget, const GdkEvent *event);