From df9151201f12a11736c317aa8c56847fb39de434 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Feb 2002 00:05:01 +0000 Subject: [PATCH] ue Feb 26 18:58:49 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): OR in the three default modifiers to any value passed in by the caller, so that the caller won't break the the default bindings. (#70142, Jody Goldberg, though he wasn't in favor of this particular way of solving it.) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkaccelgroup.c | 5 ++++- 8 files changed, 60 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 45b06e5718..8940ffb0be 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Feb 26 18:58:49 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask): + OR in the three default modifiers to any value passed + in by the caller, so that the caller won't break the + the default bindings. (#70142, Jody Goldberg, though he + wasn't in favor of this particular way of solving it.) + Tue Feb 26 18:47:44 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 39db5d6330..e2d7d9ce0c 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -1158,6 +1158,8 @@ gtk_accelerator_name (guint accelerator_key, * accelerators. The default mod mask is #GDK_CONTROL_MASK | * #GDK_SHIFT_MASK | #GDK_MOD1_MASK, that is, Control, Shift, and Alt. * Other modifiers will by default be ignored by #GtkAccelGroup. + * You must include at least the three default modifiers in any + * value you pass to this function. * * The default mod mask should be changed on application startup, * before using any accelerator groups. @@ -1165,7 +1167,8 @@ gtk_accelerator_name (guint accelerator_key, void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask) { - default_accel_mod_mask = default_mod_mask & GDK_MODIFIER_MASK; + default_accel_mod_mask = (default_mod_mask & GDK_MODIFIER_MASK) | + (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK); } /**