diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-21 22:03:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-21 22:03:09 +0000 |
| commit | e5e5a5211212d76030b4bbaebba99fbb40055b98 (patch) | |
| tree | 5f1aabff8c358d5fc6343e28a206d34ccdbe836a /gtk/gtkmenushell.c | |
| parent | 196c1f5a020ba51eed5793c55e2f90da688f222c (diff) | |
| download | gtk+-e5e5a5211212d76030b4bbaebba99fbb40055b98.tar.gz | |
Add GDK_ISO_Next_Group/Prev_Group/Level3_Shift/ First_Group/Last_Group to
Thu Feb 21 16:51:17 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccelgroup.c (gtk_accelerator_valid): Add
GDK_ISO_Next_Group/Prev_Group/Level3_Shift/
First_Group/Last_Group to list of invalid accelerators.
(A lot more that should be added, but probably would
want a range mechanism. These are the ones found in
the standard XFree86 config files.)
* gtk/gtkbindings.c (gtk_bindings_activate): Fix problem
that broke bindings for menus.
* gtk/gtkwindow.[ch]: Export _gtk_window_activate_key()
privately.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
_gtk_window_activate_key(), gtk_bindings_activate_event().
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 46355216ad..2d352700d2 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -551,21 +551,14 @@ gtk_menu_shell_key_press (GtkWidget *widget, if (!menu_shell->active_menu_item && menu_shell->parent_menu_shell) return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent *)event); - if (gtk_bindings_activate (GTK_OBJECT (widget), - event->keyval, - event->state)) + if (_gtk_bindings_activate_event (GTK_OBJECT (widget), event)) return TRUE; toplevel = gtk_widget_get_toplevel (widget); if (GTK_IS_WINDOW (toplevel) && - gtk_window_mnemonic_activate (GTK_WINDOW (toplevel), - event->keyval, - event->state)) + _gtk_window_activate_key (GTK_WINDOW (toplevel), event)) return TRUE; - if (gtk_accel_groups_activate (G_OBJECT (widget), event->keyval, event->state)) - return TRUE; - return FALSE; } |