From 582af2369931867e86f28f8a4314964a34fa0ade Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Sep 2005 19:25:47 +0000 Subject: [PATCH] Don't use GDK_ALT_MASK. 2005-09-06 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_parse): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): Don't use GDK_ALT_MASK. * gdk/gdktypes.h: No need to introduce GDK_ALT_MASK --- ChangeLog | 15 +++++++++++++-- ChangeLog.pre-2-10 | 15 +++++++++++++-- gdk/gdktypes.h | 1 - gtk/gtkaccelgroup.c | 2 +- gtk/gtkaccellabel.c | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e589792fdb..14983c3f73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2005-09-06 Matthias Clasen + * gtk/gtkaccelgroup.c (gtk_accelerator_parse): + * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): + Don't use GDK_ALT_MASK. + + * gdk/gdktypes.h: No need to introduce GDK_ALT_MASK + + * gdk/gdkpixbuf-drawable.c (convert_real_slow): Remove a dead + variable. + +2005-09-06 Matthias Clasen + + Add support for extra virtual modifiers: (#85780, Owen Taylor) + * tests/testgtk.c (create_key_lookup): Add tests for extra virtual modifiers. @@ -10,8 +23,6 @@ * gtk/gtkaccelgroup.c (gtk_accelerator_parse) (gtk_accelerator_name): Support Super, Hyper Meta and Mod2 - Mod5. - Add support for extra virtual modifiers: (#85780, Owen Taylor) - * gdk/x11/gdkkeys-x11.c (struct _GdkKeymapX11): Add a modmap to maintain the information which X modifiers map to virtual modifiers. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e589792fdb..14983c3f73 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,18 @@ 2005-09-06 Matthias Clasen + * gtk/gtkaccelgroup.c (gtk_accelerator_parse): + * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): + Don't use GDK_ALT_MASK. + + * gdk/gdktypes.h: No need to introduce GDK_ALT_MASK + + * gdk/gdkpixbuf-drawable.c (convert_real_slow): Remove a dead + variable. + +2005-09-06 Matthias Clasen + + Add support for extra virtual modifiers: (#85780, Owen Taylor) + * tests/testgtk.c (create_key_lookup): Add tests for extra virtual modifiers. @@ -10,8 +23,6 @@ * gtk/gtkaccelgroup.c (gtk_accelerator_parse) (gtk_accelerator_name): Support Super, Hyper Meta and Mod2 - Mod5. - Add support for extra virtual modifiers: (#85780, Owen Taylor) - * gdk/x11/gdkkeys-x11.c (struct _GdkKeymapX11): Add a modmap to maintain the information which X modifiers map to virtual modifiers. diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 3998e5586c..648bb40e39 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -119,7 +119,6 @@ typedef enum GDK_LOCK_MASK = 1 << 1, GDK_CONTROL_MASK = 1 << 2, GDK_MOD1_MASK = 1 << 3, - GDK_ALT_MASK = GDK_MOD1_MASK, GDK_MOD2_MASK = 1 << 4, GDK_MOD3_MASK = 1 << 5, GDK_MOD4_MASK = 1 << 6, diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index e76dc0de1e..5bc525f963 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -1087,7 +1087,7 @@ gtk_accelerator_parse (const gchar *accelerator, { accelerator += 5; len -= 5; - mods |= GDK_ALT_MASK; + mods |= GDK_MOD1_MASK; } else if (len >= 6 && is_meta (accelerator)) { diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index fcfb80c975..5c783b2110 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -556,7 +556,7 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass, g_string_append (gstring, klass->mod_name_control); seen_mod = TRUE; } - if (accelerator_mods & GDK_ALT_MASK) + if (accelerator_mods & GDK_MOD1_MASK) { if (seen_mod) g_string_append (gstring, klass->mod_separator);