From a4d12691fbd0b9d6fe47134df06b71f7ca76ef00 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 12 Dec 2001 19:30:01 +0000 Subject: [PATCH] Fix check for modifiers. Wed Dec 12 14:27:30 2001 Owen Taylor * gtk/gtkmenubar.c (window_key_press_handler): Fix check for modifiers. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenubar.c | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6232eafcaf..047ae29302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6232eafcaf..047ae29302 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 12 14:27:30 2001 Owen Taylor + + * gtk/gtkmenubar.c (window_key_press_handler): Fix check for + modifiers. + 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index d38da28962..ee143de36c 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -382,7 +382,8 @@ window_key_press_handler (GtkWidget *widget, * AccelGroup changes etc. */ if (event->keyval == keyval && - (mods & event->state) == mods) + ((event->state & gtk_accelerator_get_default_mod_mask ()) == + (mods & gtk_accelerator_get_default_mod_mask ()))) { GtkMenuBar *menubar; GtkMenuShell *menushell;