diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
| commit | fdff4cb1ffa76e894dd41ca5f97d31f122fd3f86 (patch) | |
| tree | 20059e8c98923d27f235c9f12de31be97e20240f /Source/Core/DolphinWX/Src/WXInputBase.cpp | |
| parent | 2b77acc705eae11fdb4a25be6d6ea5db1fa52e21 (diff) | |
| parent | 5a8ad9230271a5088b0cf582932959214c6b5527 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/DolphinWX/Src/WXInputBase.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/WXInputBase.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp index 3ed7f60ecd..467371ae9c 100644 --- a/Source/Core/DolphinWX/Src/WXInputBase.cpp +++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp @@ -43,7 +43,10 @@ const wxString WXKeyToString(int keycode) case WXK_CLEAR: return _("Clear"); case WXK_SHIFT: return wxT("Shift"); case WXK_ALT: return wxT("Alt"); - case WXK_CONTROL: return _("Control"); + case WXK_RAW_CONTROL: return _("Control"); +#ifdef __WXOSX__ + case WXK_COMMAND: return _("Command"); +#endif case WXK_MENU: return _("Menu"); case WXK_PAUSE: return _("Pause"); case WXK_CAPITAL: return _("Caps Lock"); @@ -131,7 +134,6 @@ const wxString WXKeyToString(int keycode) case WXK_WINDOWS_LEFT: return _("Windows Left"); case WXK_WINDOWS_RIGHT: return _("Windows Right"); case WXK_WINDOWS_MENU: return _("Windows Menu"); - case WXK_COMMAND: return _("Command"); } if (keycode > WXK_SPACE && keycode < WXK_DELETE) { |