fix inadvertent case change

diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index 0c4e7248bf6870ccb4d6bf5c854ed6af80006406..667c2cfaaae544160c708c663f11c34b3550dc55 100644 (file)
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -160,7 +160,19 @@ KeyboardKey::display_label () const
         *  on all platforms, notably the command key on OS X.
         */
 
-       return gtk_accelerator_get_label (key(), (GdkModifierType) state());
+        uint32_t mod = state();
+
+#ifdef __APPLE__
+                /* We use both bits (MOD2|META) for Primary on OS X,
+                 * but we don't want MOD2 showing up in listings.
+                 */
+
+                if (mod & GDK_MOD2_MASK) {
+                        mod &= ~GDK_MOD2_MASK;
+                }
+#endif
+
+       return gtk_accelerator_get_label (key(), (GdkModifierType) mod);
 }
 
 string

diff --git a/wscript b/wscript
index eae6aee8e02872451540f4f960541d178951dad8..c0c70377c2049c3cf55fe6ce5c233353ade8071f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -846,7 +846,7 @@ def configure(conf):
         conf.define ('HAVE_COREAUDIO', 1)
         conf.define ('AUDIOUNIT_SUPPORT', 1)
 
-        Conf.define ('TOP_MENUBAR',1)
+        conf.define ('TOP_MENUBAR',1)
 
         # It would be nice to be able to use this to force back-compatibility with 10.4
         # but even by the time of 11, the 10.4 SDK is no longer available in any normal