summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-02-06 02:16:40 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-02-06 02:16:40 +0000
commit3c1f6bc51b9aa4218781db358d231fcf16003842 (patch)
tree450e8d148e16028352db443ed908030374423ffc
parent359e69ab882975da1b95f21e5ba876461aceea40 (diff)
fix up forgotten Keyboard ideas of modifiers
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3015 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/keyboard.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index cc81eddb19..549b601ec2 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -21,6 +21,7 @@
#include <algorithm>
#include <fstream>
+#include <iostream>
#include <ctype.h>
@@ -44,10 +45,10 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK;
guint Keyboard::snap_mod = GDK_MOD3_MASK;
#ifdef GTKOSX
-guint Keyboard::PrimaryModifier = GDK_MOD1_MASK; // Command
-guint Keyboard::SecondaryModifier = GDK_MOD5_MASK; // Alt/Option
+guint Keyboard::PrimaryModifier = GDK_META_MASK; // Command
+guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option
guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift
-guint Keyboard::CopyModifier = GDK_MOD5_MASK; // Alt/Option
+guint Keyboard::CopyModifier = GDK_MOD1_MASK; // Alt/Option
guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK;
#else
guint Keyboard::PrimaryModifier = GDK_CONTROL_MASK; // Control