adapt defines for ctrl/command key

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:00:52 +00:00
parent 5266f34590
commit 3c5f62640d
6 changed files with 10 additions and 7 deletions
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -2667,9 +2667,9 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
        mac_modifiers |= optionKey;
    if ( modifiers & wxMOD_SHIFT )
        mac_modifiers |= shiftKey;
-    if ( modifiers & wxMOD_CONTROL )
+    if ( modifiers & wxMOD_RAW_CONTROL )
        mac_modifiers |= controlKey;
-    if ( modifiers & wxMOD_META )
+    if ( modifiers & wxMOD_CONTROL )
        mac_modifiers |= cmdKey;
    
    EventHotKeyRef hotKeyRef;