From c05c9fa1f4a188c757bd387ded736bdec1328466 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 9 Jun 2010 20:03:37 +0000 Subject: Use 10.5 compatible API's to get list of display resolutions on OS X. Patch from user gamepromcompany on the MacOSX_Build wiki page. Add support for the Mac command key as a hotkey modifier in WXKeyToString but present it as Control. WXKeyToString is used for both hotkeys and menu accelerators, the latter only supporting Shift/Alt/Control with wxWidgets. wxSpinCtrl on wx 2.9 has a very small default size, so give the window size ones a reasonable size. Use wxFULLSCREEN_ALL when switching to fullscreen, which gets rid of window decorations like the title bar. Note that to actually be rid of it with wx 2.9 on OS X, you'll need this patch: http://trac.wxwidgets.org/ticket/11701 Also remove a couple of files I had accidentally duplicated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5642 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/WXInputBase.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/Src/WXInputBase.cpp') diff --git a/Source/Core/InputCommon/Src/WXInputBase.cpp b/Source/Core/InputCommon/Src/WXInputBase.cpp index 3d01ad08d0..8255ba94e7 100644 --- a/Source/Core/InputCommon/Src/WXInputBase.cpp +++ b/Source/Core/InputCommon/Src/WXInputBase.cpp @@ -31,6 +31,10 @@ const wxString WXKeyToString(int keycode) case WXK_SPACE: return wxT("Space"); case WXK_DELETE: return wxT("Delete"); + // Undocumented wx keycodes + case 167: return wxT("Paragraph"); + case 177: return wxT("Plus-Minus"); + case WXK_START: return wxT("Start"); case WXK_LBUTTON: return wxT("L Button"); case WXK_RBUTTON: return wxT("R Button"); @@ -142,9 +146,12 @@ const wxString WXKeymodToString(int modifier) switch (modifier) { case wxMOD_ALT: return wxT("Alt"); - case wxMOD_CMD: return wxT("Ctrl"); + case wxMOD_CONTROL: return wxT("Ctrl"); case wxMOD_ALTGR: return wxT("Ctrl+Alt"); case wxMOD_SHIFT: return wxT("Shift"); + // wxWidgets can only use Alt/Ctrl/Shift as menu accelerators, + // so Meta (Command on OS X) is simply made equivalent to Ctrl. + case wxMOD_META: return wxT("Ctrl"); default: return wxT(""); } } -- cgit v1.2.3