[gtk/wip/carlosg/drop-search-handle-event: 4/7] filechooserwidget: Drop usage of gtk_search_entry_handle_event()



commit e59c6abd91d27a34a2f57dc831e513246eeefecf
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Apr 3 13:16:49 2019 +0200

    filechooserwidget: Drop usage of gtk_search_entry_handle_event()
    
    Just use gtk_event_controller_key_forward() to let know the search
    entry of the Esc key being pressed.

 gtk/gtkfilechooserwidget.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index dc5bab6176..988df4ba31 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1318,11 +1318,11 @@ should_trigger_location_entry (GtkFileChooserWidget *impl,
  * pressed.
  */
 static gboolean
-key_press_cb (GtkEventController *controller,
-              guint               keyval,
-              guint               keycode,
-              GdkModifierType     state,
-              gpointer            data)
+key_press_cb (GtkEventControllerKey *controller,
+              guint                  keyval,
+              guint                  keycode,
+              GdkModifierType        state,
+              gpointer               data)
 {
   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
   GtkFileChooserWidgetPrivate *priv = impl->priv;
@@ -1378,8 +1378,8 @@ key_press_cb (GtkEventController *controller,
   if (keyval == GDK_KEY_Escape &&
       priv->operation_mode == OPERATION_MODE_SEARCH)
     {
-      gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event);
-      return GDK_EVENT_STOP;
+      return gtk_event_controller_key_forward (controller,
+                                               gtk_search_entry_get_text_widget (GTK_SEARCH_ENTRY 
(priv->search_entry)));
     }
 
   return GDK_EVENT_PROPAGATE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]