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.
This commit is contained in:
Colin Walters
2010-09-08 13:35:51 -04:00
parent 03c19e37af
commit 913cdf3be7
62 changed files with 5503 additions and 3255 deletions

View File

@ -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;