Commit df915120 authored by Owen Taylor's avatar Owen Taylor

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.)
parent 386f8d1f
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
Tue 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.)
Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com> Tue Feb 26 18:47:44 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_add_mnemonic): Append * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append
......
...@@ -1158,6 +1158,8 @@ gtk_accelerator_name (guint accelerator_key, ...@@ -1158,6 +1158,8 @@ gtk_accelerator_name (guint accelerator_key,
* accelerators. The default mod mask is #GDK_CONTROL_MASK | * accelerators. The default mod mask is #GDK_CONTROL_MASK |
* #GDK_SHIFT_MASK | #GDK_MOD1_MASK, that is, Control, Shift, and Alt. * #GDK_SHIFT_MASK | #GDK_MOD1_MASK, that is, Control, Shift, and Alt.
* Other modifiers will by default be ignored by #GtkAccelGroup. * 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, * The default mod mask should be changed on application startup,
* before using any accelerator groups. * before using any accelerator groups.
...@@ -1165,7 +1167,8 @@ gtk_accelerator_name (guint accelerator_key, ...@@ -1165,7 +1167,8 @@ gtk_accelerator_name (guint accelerator_key,
void void
gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask) 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);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment