diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-22 19:52:18 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-22 19:52:18 -0400 |
| commit | 41577f044a64c138fa0f9775482e41b343d7e9e5 (patch) | |
| tree | 9eed8142347937126aa92af658b961e1164eb0eb /Source/Core | |
| parent | 624972e37c62d1dd8d61419f7792ee1d56eea1ea (diff) | |
| parent | 77ce389bb027cbf99fc76291c363c0986e021cb4 (diff) | |
Merge pull request #844 from lioncash/wx-hotkey
DolphinWX: Get rid of unnecessary hotkey code.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index a9334686fc..428c97edc0 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -470,12 +470,6 @@ wxString CFrame::GetMenuLabel(int Id) Label = wxString::Format(_("Undefined %i"), Id); } - // wxWidgets only accepts Ctrl/Alt/Shift as menu accelerator - // modifiers. On OS X, "Ctrl+" is mapped to the Command key. -#ifdef __APPLE__ - if (hotkeymodifier & wxMOD_CMD) - hotkeymodifier |= wxMOD_CONTROL; -#endif hotkeymodifier &= wxMOD_CONTROL | wxMOD_ALT | wxMOD_SHIFT; Modifier = InputCommon::WXKeymodToString(hotkeymodifier); |