X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9ec5961f0ad1594d48205b3902130f3a5c85a3..538f284a44001ff8285eaafebcc384bf638b5d66:/src/osx/carbon/app.cpp diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index 161ab55387..171eb0825b 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -1319,8 +1319,8 @@ CGKeyCode wxCharCodeWXToOSX(wxKeyCode code) case WXK_SHIFT: keycode = kVK_Shift; break; case WXK_ALT: keycode = kVK_Option; break; - case WXK_CONTROL: keycode = kVK_Control; break; - case WXK_COMMAND: keycode = kVK_Command; break; + case WXK_RAW_CONTROL: keycode = kVK_Control; break; + case WXK_CONTROL: keycode = kVK_Command; break; case WXK_CAPITAL: keycode = kVK_CapsLock; break; case WXK_END: keycode = kVK_End; break; @@ -1530,6 +1530,7 @@ int wxMacKeyCodeToModifier(wxKeyCode key) { case WXK_START: case WXK_MENU: + case WXK_COMMAND: return cmdKey; case WXK_SHIFT: @@ -1541,7 +1542,7 @@ int wxMacKeyCodeToModifier(wxKeyCode key) case WXK_ALT: return optionKey; - case WXK_CONTROL: + case WXK_RAW_CONTROL: return controlKey; default: