From a598c5d4acaebae47a997eb5540f1c2f9e4690e1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 27 Oct 2015 14:42:31 -0400 Subject: [PATCH] fix inadvertent case change --- libs/gtkmm2ext/bindings.cc | 14 +++++++++++++- wscript | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 0c4e7248bf..667c2cfaaa 100644 --- 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 eae6aee8e0..c0c70377c2 100644 --- 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