[gtk+/wip/carlosg/private-event-structs] entry: Convert to GdkEvent API
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/carlosg/private-event-structs] entry: Convert to GdkEvent API
- Date: Sat, 26 Aug 2017 02:56:20 +0000 (UTC)
commit 7efac6bcebbe6d4557dca1fc0a7b03a4c65ba73f
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Aug 25 22:52:27 2017 -0400
entry: Convert to GdkEvent API
gtk/gtkentry.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index fa318bf..2e4eedb 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4040,12 +4040,14 @@ gtk_entry_obscure_mouse_cursor (GtkEntry *entry)
static gint
gtk_entry_key_press (GtkWidget *widget,
- GdkEventKey *event)
+ GdkEventKey *ev)
{
GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = entry->priv;
+ GdkEvent *event = (GdkEvent *) ev;
gboolean retval = FALSE;
guint keyval;
+ const char *string;
if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval))
return GDK_EVENT_PROPAGATE;
@@ -4057,13 +4059,13 @@ gtk_entry_key_press (GtkWidget *widget,
gtk_entry_selection_bubble_popup_unset (entry);
- if (!event->send_event && priv->text_handle)
+ if (!gdk_event_is_sent (event) && priv->text_handle)
_gtk_text_handle_set_mode (priv->text_handle,
GTK_TEXT_HANDLE_MODE_NONE);
if (priv->editable)
{
- if (gtk_im_context_filter_keypress (priv->im_context, event))
+ if (gtk_im_context_filter_keypress (priv->im_context, ev))
{
priv->need_im_reset = TRUE;
retval = TRUE;
@@ -4077,14 +4079,16 @@ gtk_entry_key_press (GtkWidget *widget,
keyval == GDK_KEY_Escape)
gtk_entry_reset_im_context (entry);
- if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->key_press_event (widget, event))
+ if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->key_press_event (widget, ev))
{
/* Activate key bindings */
retval = TRUE;
goto out;
}
- if (!priv->editable && event->length)
+ gdk_event_get_string (event, &string);
+
+ if (!priv->editable && string[0] != '\0')
gtk_widget_error_bell (widget);
out:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]