AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

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

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

	* gtk/gtkaccelgroup.c: Include Super, Hyper and Meta in the
	default accel mod mask.
This commit is contained in:
Matthias Clasen 2005-09-06 19:52:50 +00:00 committed by Matthias Clasen
parent 557e266ad9
commit 77494a0a1c
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-09-06 Matthias Clasen <mclasen@redhat.com> 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/gtkaccelgroup.c (gtk_accelerator_parse):
* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
Don't use GDK_ALT_MASK. Don't use GDK_ALT_MASK.

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2005-09-06 Matthias Clasen <mclasen@redhat.com> 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/gtkaccelgroup.c (gtk_accelerator_parse):
* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
Don't use GDK_ALT_MASK. Don't use GDK_ALT_MASK.

15
gtk/gtkaccelgroup.c
View File

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