Include Super, Hyper and Meta in the default accel mod mask.

2005-09-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccelgroup.c: Include Super, Hyper and Meta in the
	default accel mod mask.

diff --git a/ChangeLog b/ChangeLog
index 515c1f6d1948a36da4f509acb4e92ef5aed4feff..1f18b7c9fe14e6a0cb977118b50b949a3d51d767 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelgroup.c: Include Super, Hyper and Meta in the
+       default accel mod mask.
+
        * gtk/gtkaccelgroup.c (gtk_accelerator_parse): 
        * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
        Don't use GDK_ALT_MASK.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 515c1f6d1948a36da4f509acb4e92ef5aed4feff..1f18b7c9fe14e6a0cb977118b50b949a3d51d767 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-09-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaccelgroup.c: Include Super, Hyper and Meta in the
+       default accel mod mask.
+
        * gtk/gtkaccelgroup.c (gtk_accelerator_parse): 
        * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
        Don't use GDK_ALT_MASK.

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 5bc525f96385310fd0e55b709ec936f72c341e0b..55d9cafe369407fe54cf6310929004c68599f206 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -51,7 +51,10 @@ static guint          signal_accel_changed = 0;
 static guint            quark_acceleratable_groups = 0;
 static guint            default_accel_mod_mask = (GDK_SHIFT_MASK |
                                                   GDK_CONTROL_MASK |
-                                                  GDK_MOD1_MASK);
+                                                  GDK_MOD1_MASK |
+                                                  GDK_SUPER_MASK |
+                                                  GDK_HYPER_MASK |
+                                                  GDK_META_MASK);
 
 
 /* --- functions --- */
@@ -1297,10 +1300,12 @@ gtk_accelerator_get_label (guint           accelerator_key,
  *
  * Sets the modifiers that will be considered significant for keyboard
  * 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.
+ * #GDK_SHIFT_MASK | #GDK_MOD1_MASK | #GDK_SUPER_MASK | 
+ * #GDK_HYPER_MASK | #GDK_META_MASK, that is, Control, Shift, Alt, 
+ * Super, Hyper and Meta. Other modifiers will by default be ignored 
+ * by #GtkAccelGroup.
+ * You must include at least the three modifiers Control, Shift
+ * and Alt in any value you pass to this function.
  *
  * The default mod mask should be changed on application startup,
  * before using any accelerator groups.