Don't use GDK_ALT_MASK.

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

	* 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

diff --git a/ChangeLog b/ChangeLog
index e589792fdbc9560954bf259c5e7be7e5b40b0844..14983c3f73ca00214de5ff0b2fbe1c29b573e9c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2005-09-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>
+
+       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 e589792fdbc9560954bf259c5e7be7e5b40b0844..14983c3f73ca00214de5ff0b2fbe1c29b573e9c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,18 @@
 2005-09-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>
+
+       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 3998e5586cb9daf4ed1ec0286e729af6adf0a579..648bb40e3967075f5a6c80b91b6b23b94fdb4d8d 100644 (file)
--- 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 e76dc0de1ec29e3665dfaf2d51a01a9ee92fc0c2..5bc525f96385310fd0e55b709ec936f72c341e0b 100644 (file)
--- 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 fcfb80c97522b2886a58db2ff653b87d23f52cde..5c783b21109145b4e1c3d90d044363c85a5583f1 100644 (file)
--- 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);