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.)

diff --git a/ChangeLog b/ChangeLog
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 45b06e5718018583c72ed197d9a694bd482a4212..8940ffb0be164a9a495e11ae9c683d80613447e2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+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>
 
        * gtk/gtkwindow.c (gtk_window_add_mnemonic): Append

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 39db5d6330d034ac28d518c84e5e3a107a5e7d89..e2d7d9ce0c493ce1c6c3450d37f2896cf6769f10 100644 (file)
--- 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);
 }
 
 /**