[gtk+/wip/matthiasc/kill-key-events2: 42/48] entry: Stop using ::key-press-event
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/kill-key-events2: 42/48] entry: Stop using ::key-press-event
- Date: Thu, 8 Feb 2018 02:36:52 +0000 (UTC)
commit e779e26ec2e1f5418eac24b5f98fcb433851aed0
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Feb 7 18:57:56 2018 -0500
entry: Stop using ::key-press-event
For now, switch to using ::event.
gtk/gtkentry.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index e469941..a89090c 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4507,14 +4507,17 @@ gtk_cell_editable_entry_activated (GtkEntry *entry, gpointer data)
}
static gboolean
-gtk_cell_editable_key_press_event (GtkEntry *entry,
- GdkEventKey *key_event,
- gpointer data)
+gtk_cell_editable_event (GtkEntry *entry,
+ GdkEvent *event,
+ gpointer data)
{
GtkEntryPrivate *priv = entry->priv;
guint keyval;
- if (!gdk_event_get_keyval ((GdkEvent *) key_event, &keyval))
+ if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
+ return GDK_EVENT_PROPAGATE;
+
+ if (!gdk_event_get_keyval (event, &keyval))
return GDK_EVENT_PROPAGATE;
if (keyval == GDK_KEY_Escape)
@@ -4544,8 +4547,8 @@ gtk_entry_start_editing (GtkCellEditable *cell_editable,
{
g_signal_connect (cell_editable, "activate",
G_CALLBACK (gtk_cell_editable_entry_activated), NULL);
- g_signal_connect (cell_editable, "key-press-event",
- G_CALLBACK (gtk_cell_editable_key_press_event), NULL);
+ g_signal_connect (cell_editable, "event",
+ G_CALLBACK (gtk_cell_editable_event), NULL);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]