diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-23 17:21:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-23 17:21:22 +0000 |
| commit | 58a9b0f2decb21d45f70def9a2660da039599f93 (patch) | |
| tree | 73a7de4bf34e5d648748a1e925e667cc0d1b0dea /libs | |
| parent | ad8240f5c1c200b2da9c6d83440d00cfc3a539c9 (diff) | |
fix up Meta/Mod2/Command madness for OS X
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10796 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gtkmm2ext/gtkapplication_quartz.mm | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm index 03051849d3..ebb88cc1f5 100644 --- a/libs/gtkmm2ext/gtkapplication_quartz.mm +++ b/libs/gtkmm2ext/gtkapplication_quartz.mm @@ -870,9 +870,7 @@ cocoa_menu_item_update_accelerator (NSMenuItem *cocoa_item, modifiers |= NSControlKeyMask; } - /* gdk/quartz maps Command to Meta (XXX check this - it may move to SUPER at some point) */ - - if (key->accel_mods & GDK_META_MASK) { + if (key->accel_mods & GDK_MOD2_MASK) { modifiers |= NSCommandKeyMask; } } diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 5d228e1821..3404b7274d 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -28,7 +28,7 @@ using namespace Gdk; using namespace std; #ifdef GTKOSX -int PixFader::fine_scale_modifier = GDK_META_MASK; +int PixFader::fine_scale_modifier = GDK_MOD2_MASK; #else int PixFader::fine_scale_modifier = GDK_CONTROL_MASK; #endif |