fix up forgotten Keyboard ideas of modifiers

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3015 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index cc81eddb1965346eaa9dfb7164932ae896ee837a..549b601ec2e1038eac50f35356c2d8c335822407 100644 (file)
--- 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