diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-08 13:35:51 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-08 18:51:44 -0400 |
| commit | 913cdf3be750a1e74c09b20edf55a57f9a919fcc (patch) | |
| tree | 0d2129a167579c0d896bb9213503619b2ef44d1f /gtk/gtkstatusicon.c | |
| parent | 03c19e37af1f7aa9af8a48bcc9dc023397f8693f (diff) | |
| download | gtk+-913cdf3be750a1e74c09b20edf55a57f9a919fcc.tar.gz | |
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.
Diffstat (limited to 'gtk/gtkstatusicon.c')
| -rw-r--r-- | gtk/gtkstatusicon.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |