summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-09-08 13:35:51 -0400
committerColin Walters <walters@verbum.org>2010-09-08 18:51:44 -0400
commit913cdf3be750a1e74c09b20edf55a57f9a919fcc (patch)
tree0d2129a167579c0d896bb9213503619b2ef44d1f /gtk/gtkmain.c
parent03c19e37af1f7aa9af8a48bcc9dc023397f8693f (diff)
downloadgtk+-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/gtkmain.c')
-rw-r--r--gtk/gtkmain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 6f3c5ea649..03f33c6946 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1713,7 +1713,7 @@ gtk_main_do_event (GdkEvent *event)
/* Catch alt press to enable auto-mnemonics;
* menus are handled elsewhere
*/
- if ((event->key.keyval == GDK_Alt_L || event->key.keyval == GDK_Alt_R) &&
+ if ((event->key.keyval == GDK_KEY_Alt_L || event->key.keyval == GDK_KEY_Alt_R) &&
!GTK_IS_MENU_SHELL (grab_widget))
{
gboolean auto_mnemonics;