From: Ryan Norton Date: Sun, 28 Dec 2003 22:46:08 +0000 (+0000) Subject: Added/Fixed some things in wxGetKeyState X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15c2acd23deb5c7b51948e2fd24ebe5c2a2903b3?ds=inline Added/Fixed some things in wxGetKeyState git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/app.cpp b/src/mac/app.cpp index bfb7958138..465ef52384 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -1762,6 +1762,7 @@ int wxKeyCodeToMacModifier(wxKeyCode key) switch (key) { case WXK_START: + case WXK_MENU: return cmdKey; case WXK_SHIFT: @@ -1770,8 +1771,8 @@ int wxKeyCodeToMacModifier(wxKeyCode key) case WXK_CAPITAL: return alphaLock; -// case WXK_OPTION: -// return optionKey; + case WXK_ALT: + return optionKey; case WXK_CONTROL: return controlKey; diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index bfb7958138..465ef52384 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1762,6 +1762,7 @@ int wxKeyCodeToMacModifier(wxKeyCode key) switch (key) { case WXK_START: + case WXK_MENU: return cmdKey; case WXK_SHIFT: @@ -1770,8 +1771,8 @@ int wxKeyCodeToMacModifier(wxKeyCode key) case WXK_CAPITAL: return alphaLock; -// case WXK_OPTION: -// return optionKey; + case WXK_ALT: + return optionKey; case WXK_CONTROL: return controlKey;