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/gtkmenushell.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/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 763a6dbfbd..42542c8662 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -328,39 +328,39 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, - GDK_Escape, 0, + GDK_KEY_Escape, 0, "cancel", 0); gtk_binding_entry_add_signal (binding_set, - GDK_Return, 0, + GDK_KEY_Return, 0, "activate-current", 1, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, - GDK_ISO_Enter, 0, + GDK_KEY_ISO_Enter, 0, "activate-current", 1, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Enter, 0, + GDK_KEY_KP_Enter, 0, "activate-current", 1, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, - GDK_space, 0, + GDK_KEY_space, 0, "activate-current", 1, G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Space, 0, + GDK_KEY_KP_Space, 0, "activate-current", 1, G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, - GDK_F10, 0, + GDK_KEY_F10, 0, "cycle-focus", 1, GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD); gtk_binding_entry_add_signal (binding_set, - GDK_F10, GDK_SHIFT_MASK, + GDK_KEY_F10, GDK_SHIFT_MASK, "cycle-focus", 1, GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD); |