ardour/livetrax
13
0
Fork 0
Code

fix inadvertent case change

Browse Source
This commit is contained in:
Paul Davis 2015-10-27 14:42:31 -04:00
parent d2a6fec03a
commit a598c5d4ac
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/gtkmm2ext/bindings.cc
View File

@ -160,7 +160,19 @@ KeyboardKey::display_label () const
* on all platforms, notably the command key on OS X. * 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 string

2
wscript
View File

@ -846,7 +846,7 @@ def configure(conf):
conf.define ('HAVE_COREAUDIO', 1) conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 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 # 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 # but even by the time of 11, the 10.4 SDK is no longer available in any normal