From 784adc53bb5d70113f87b3430dea90eb87555d0a Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 20 Oct 2015 04:08:28 +1100 Subject: [PATCH] Test fix for further osx modifier ambiguity. --- gtk2_ardour/rc_option_editor.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index eab18ab503..e86c3a620e 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -333,13 +333,13 @@ static const struct { { "Command", GDK_MOD2_MASK }, { "Control", GDK_CONTROL_MASK }, { "Option", GDK_MOD1_MASK }, - { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK }, - { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK }, - { "Command-Option-Control", GDK_MOD1_MASK|GDK_META_MASK|GDK_CONTROL_MASK }, + { "Command-Shift", GDK_MOD2_MASK|GDK_SHIFT_MASK }, + { "Command-Option", GDK_MOD2_MASK|GDK_MOD1_MASK }, + { "Command-Option-Control", GDK_MOD2_MASK|GDK_MOD1_MASK|GDK_CONTROL_MASK }, { "Option-Control", GDK_MOD1_MASK|GDK_CONTROL_MASK }, { "Option-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK }, { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK }, - { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK }, + { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD2_MASK }, #else { "Key|Shift", GDK_SHIFT_MASK },