OSX copy/constraint mod tweak (amend 0675fe1)

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index a75635cf94676372a515c9edad8b2afd6593e5d3..79f83a4341c0c8c0915201cb990c2c432940783f 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -48,7 +48,11 @@ accel_map_changed (GtkAccelMap* /*map*/,
        me->ui.setup_tooltips ();
 }
 
+#ifdef GTKOSX
+guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
+#else
 guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;
+#endif
 guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier;
 guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier;
 guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier;

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 0e608af90168829851498d008989e7fc2d5461bf..e7a080c0361791e97d0c664b1d36e1c107462430 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -511,7 +511,13 @@ public:
                set_popdown_strings (_copy_modifier_combo, dumb);
                _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"),
+#ifdef GTKOSX
+                                                                    Keyboard::secondary_modifier_name (),
+#else
+                                                                    Keyboard::primary_modifier_name (),
+#endif
+                                                                    restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
                                _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -532,7 +538,13 @@ public:
                set_popdown_strings (_constraint_modifier_combo, dumb);
                _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::secondary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"),
+#ifdef GTKOSX
+                                                                    Keyboard::primary_modifier_name (),
+#else
+                                                                    Keyboard::secondary_modifier_name (),
+#endif
+                                                                    restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
                                _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));