diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2002-02-27 00:05:01 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-27 00:05:01 +0000 |
| commit | df9151201f12a11736c317aa8c56847fb39de434 (patch) | |
| tree | c3649aed3eb368588f01e4f2e09fc84902a1994d /gtk/gtkaccelgroup.c | |
| parent | 386f8d1f622e90413d055d8cb417b3650ad2164d (diff) | |
| download | gtk+-df9151201f12a11736c317aa8c56847fb39de434.tar.gz | |
ue Feb 26 18:58:49 2002 Owen Taylor <otaylor@redhat.com>
* 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.)
Diffstat (limited to 'gtk/gtkaccelgroup.c')
| -rw-r--r-- | gtk/gtkaccelgroup.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); } /** |