From 913cdf3be750a1e74c09b20edf55a57f9a919fcc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 8 Sep 2010 13:35:51 -0400 Subject: GDK: Prefix key names with KEY_ The keysyms create a lot of potential namespace conflicts for C, and are especially problematic for introspection, where we take constants into the namespace, so GDK_Display conflicts with GdkDisplay. For C application compatiblity, add gdkkeysyms-compat.h which uses the old names. Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is the gtkimcontextsimple.c, since porting that requires porting more custom Perl code. --- gtk/gtkstatusicon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gtk/gtkstatusicon.c') diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index e4f31d2017..89ce944f3a 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -1702,11 +1702,11 @@ gtk_status_icon_key_press (GtkStatusIcon *status_icon, state = event->state & gtk_accelerator_get_default_mod_mask (); keyval = event->keyval; if (state == 0 && - (keyval == GDK_Return || - keyval == GDK_KP_Enter || - keyval == GDK_ISO_Enter || - keyval == GDK_space || - keyval == GDK_KP_Space)) + (keyval == GDK_KEY_Return || + keyval == GDK_KEY_KP_Enter || + keyval == GDK_KEY_ISO_Enter || + keyval == GDK_KEY_space || + keyval == GDK_KEY_KP_Space)) { emit_activate_signal (status_icon); return TRUE; -- cgit v1.2.1