From a648aca65c8c0096410cfb70b8e8cfffb06016aa Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 17 Mar 2012 18:12:27 -0700 Subject: wxWidgets3: update to svn r70933 --- Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Src/WXInputBase.cpp') diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp index 3ed7f60ecd..fdc738d8e0 100644 --- a/Source/Core/DolphinWX/Src/WXInputBase.cpp +++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp @@ -43,7 +43,7 @@ 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"); case WXK_MENU: return _("Menu"); case WXK_PAUSE: return _("Pause"); case WXK_CAPITAL: return _("Caps Lock"); -- cgit v1.2.3 From c3d13b048c40b9df99d401939bd747e1de5c878e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 02:31:19 -0700 Subject: build against wxWidgets3 from Externals on Windows. use Externals version of libpng on Windows. --- Source/Core/DolphinWX/Src/WXInputBase.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Src/WXInputBase.cpp') diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp index fdc738d8e0..467371ae9c 100644 --- a/Source/Core/DolphinWX/Src/WXInputBase.cpp +++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp @@ -44,6 +44,9 @@ const wxString WXKeyToString(int keycode) case WXK_SHIFT: return wxT("Shift"); case WXK_ALT: return wxT("Alt"); 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) { -- cgit v1.2.3