From 4983b80d074d7f06fe10d4583fd9dd05f11615ae Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 24 Aug 2011 06:14:10 +0000 Subject: [PATCH] missing commit for RAW_CONTROL changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/app.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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: -- 2.50.0