font chooser dialog: Stop using ::key-press-event
authorMatthias Clasen <mclasen@redhat.com>
Sun, 20 May 2018 16:00:22 +0000 (12:00 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 22 May 2018 00:20:33 +0000 (20:20 -0400)
Use the generic ::event instead.

gtk/gtkfontchooserdialog.c

index 185ea38e26448b74d4afa73407845c07c122c462..0208040ef789f4e7ae4c2ad715ff806361d59c6c 100644 (file)
@@ -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);