gtk: remove the private GTK_DEFAULT_ACCEL_MOD_MASK define

[~andy/gtk] / gtk / gtkaccelgroup.c

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index b134aa1a7219c259ad71a0dfb3d87312b71b7d64..929cb038ee2ccffc36aec14849b596493914d09e 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -1219,7 +1219,7 @@ gtk_accelerator_parse (const gchar     *accelerator,
             {
               accelerator += 9;
               len -= 9;
-              mods |= GTK_DEFAULT_ACCEL_MOD_MASK;
+              mods |= _gtk_get_primary_accel_mod ();
             }
           else if (len >= 9 && is_control (accelerator))
             {
@@ -1360,10 +1360,10 @@ gtk_accelerator_name (guint           accelerator_key,
   l = 0;
   if (accelerator_mods & GDK_RELEASE_MASK)
     l += sizeof (text_release) - 1;
-  if (accelerator_mods & GTK_DEFAULT_ACCEL_MOD_MASK)
+  if (accelerator_mods & _gtk_get_primary_accel_mod ())
     {
       l += sizeof (text_primary) - 1;
-      accelerator_mods &= ~GTK_DEFAULT_ACCEL_MOD_MASK; /* consume the default accel */
+      accelerator_mods &= ~_gtk_get_primary_accel_mod (); /* consume the default accel */
     }
   if (accelerator_mods & GDK_SHIFT_MASK)
     l += sizeof (text_shift) - 1;
@@ -1397,11 +1397,11 @@ gtk_accelerator_name (guint           accelerator_key,
       strcpy (accelerator + l, text_release);
       l += sizeof (text_release) - 1;
     }
-  if (accelerator_mods & GTK_DEFAULT_ACCEL_MOD_MASK)
+  if (accelerator_mods & _gtk_get_primary_accel_mod ())
     {
       strcpy (accelerator + l, text_primary);
       l += sizeof (text_primary) - 1;
-      accelerator_mods &= ~GTK_DEFAULT_ACCEL_MOD_MASK; /* consume the default accel */
+      accelerator_mods &= ~_gtk_get_primary_accel_mod (); /* consume the default accel */
     }
   if (accelerator_mods & GDK_SHIFT_MASK)
     {