diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2019-04-03 13:21:51 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2019-04-03 13:23:34 +0200 |
commit | b842bf7bf5aa9f8425c399901f471ff15702384b (patch) | |
tree | 70ff232500a38e54ef5cb68957278ba457e3e97d /gtk/gtksearchbar.c | |
parent | edccf89020dbae75c130c701ae1765a35a3fa326 (diff) | |
download | gtk+-b842bf7bf5aa9f8425c399901f471ff15702384b.tar.gz |
gtk: Drop gtk_search_[entry|bar]_handle_event()
This is now unused, and unrecommended.
Diffstat (limited to 'gtk/gtksearchbar.c')
-rw-r--r-- | gtk/gtksearchbar.c | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index e774955d3f..ea6e134c5b 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -121,124 +121,6 @@ preedit_changed_cb (GtkEntry *entry, *preedit_changed = TRUE; } -static gboolean -gtk_search_bar_handle_event_for_entry (GtkSearchBar *bar, - GdkEvent *event) -{ - GtkSearchBarPrivate *priv = gtk_search_bar_get_instance_private (bar); - gboolean handled; - gboolean preedit_changed; - guint preedit_change_id; - gboolean res; - char *old_text, *new_text; - guint keyval, state; - - gdk_event_get_keyval (event, &keyval); - gdk_event_get_state (event, &state); - - if (gtk_search_entry_is_keynav (keyval, state) || - keyval == GDK_KEY_space || - keyval == GDK_KEY_Menu) - return GDK_EVENT_PROPAGATE; - - if (!gtk_widget_get_realized (priv->entry)) - gtk_widget_realize (priv->entry); - - handled = GDK_EVENT_PROPAGATE; - preedit_changed = FALSE; - preedit_change_id = g_signal_connect (priv->entry, "preedit-changed", - G_CALLBACK (preedit_changed_cb), &preedit_changed); - - old_text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (priv->entry))); - res = gtk_widget_event (priv->entry, event); - new_text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (priv->entry))); - - g_signal_handler_disconnect (priv->entry, preedit_change_id); - - if ((res && g_strcmp0 (new_text, old_text) != 0) || preedit_changed) - handled = GDK_EVENT_STOP; - - g_free (old_text); - g_free (new_text); - - return handled; -} - -/** - * gtk_search_bar_handle_event: - * @bar: a #GtkSearchBar - * @event: a #GdkEvent containing key press events - * - * This function should be called when the top-level - * window which contains the search bar received a key event. - * - * If the key event is handled by the search bar, the bar will - * be shown, the entry populated with the entered text and %GDK_EVENT_STOP - * will be returned. The caller should ensure that events are - * not propagated further. - * - * If no entry has been connected to the search bar, using - * gtk_search_bar_connect_entry(), this function will return - * immediately with a warning. - * - * ## Showing the search bar on key presses - * - * |[<!-- language="C" --> - * static gboolean - * on_key_press_event (GtkWidget *widget, - * GdkEvent *event, - * gpointer user_data) - * { - * GtkSearchBar *bar = GTK_SEARCH_BAR (user_data); - * return gtk_search_bar_handle_event (bar, event); - * } - * - * static void - * create_toplevel (void) - * { - * GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * GtkWindow *search_bar = gtk_search_bar_new (); - * - * // Add more widgets to the window... - * - * g_signal_connect (window, - * "key-press-event", - * G_CALLBACK (on_key_press_event), - * search_bar); - * } - * ]| - * - * Returns: %GDK_EVENT_STOP if the key press event resulted - * in text being entered in the search entry (and revealing - * the search bar if necessary), %GDK_EVENT_PROPAGATE otherwise. - */ -gboolean -gtk_search_bar_handle_event (GtkSearchBar *bar, - GdkEvent *event) -{ - GtkSearchBarPrivate *priv = gtk_search_bar_get_instance_private (bar); - gboolean handled; - - if (priv->reveal_child) - return GDK_EVENT_PROPAGATE; - - if (priv->entry == NULL) - { - g_warning ("The search bar does not have an entry connected to it. Call gtk_search_bar_connect_entry() to connect one."); - return GDK_EVENT_PROPAGATE; - } - - if (GTK_IS_SEARCH_ENTRY (priv->entry)) - handled = gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->entry), event); - else - handled = gtk_search_bar_handle_event_for_entry (bar, event); - - if (handled == GDK_EVENT_STOP) - gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), TRUE); - - return handled; -} - static void reveal_child_changed_cb (GObject *object, GParamSpec *pspec, |