summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-05-20 12:00:22 -0400
committerMatthias Clasen <mclasen@redhat.com>2018-05-21 20:20:33 -0400
commitb63def08651f932ecc5a5a2139eb6c83c4b71697 (patch)
treec538942942d08b73afcb07634a4eb10244212f02
parent6084a7ea89c8ce7ff1d7ffdecb69603f276a285d (diff)
downloadgtk+-b63def08651f932ecc5a5a2139eb6c83c4b71697.tar.gz
font chooser dialog: Stop using ::key-press-event
Use the generic ::event instead.
-rw-r--r--gtk/gtkfontchooserdialog.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index 185ea38e26..0208040ef7 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -124,16 +124,19 @@ font_activated_cb (GtkFontChooser *fontchooser,
}
static gboolean
-gtk_font_chooser_dialog_key_press_event (GtkWidget *dialog,
- GdkEventKey *event)
+gtk_font_chooser_dialog_event (GtkWidget *dialog,
+ GdkEvent *event)
{
GtkFontChooserDialog *fdialog = GTK_FONT_CHOOSER_DIALOG (dialog);
gboolean handled = FALSE;
- handled = GTK_WIDGET_CLASS (gtk_font_chooser_dialog_parent_class)->key_press_event (dialog, event);
+ if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
+ return GDK_EVENT_PROPAGATE;
+
+ handled = GTK_WIDGET_CLASS (gtk_font_chooser_dialog_parent_class)->event (dialog, event);
if (!handled)
- handled = gtk_font_chooser_widget_handle_event (fdialog->priv->fontchooser, event);
+ handled = gtk_font_chooser_widget_handle_event (fdialog->priv->fontchooser, (GdkEventKey *)event);
return handled;
}
@@ -205,7 +208,7 @@ gtk_font_chooser_dialog_class_init (GtkFontChooserDialogClass *klass)
gobject_class->get_property = gtk_font_chooser_dialog_get_property;
gobject_class->set_property = gtk_font_chooser_dialog_set_property;
- widget_class->key_press_event = gtk_font_chooser_dialog_key_press_event;
+ widget_class->event = gtk_font_chooser_dialog_event;
widget_class->map = gtk_font_chooser_dialog_map;
_gtk_font_chooser_install_properties (gobject_class);