Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #844 from lioncash/wx-hotkey
DolphinWX: Get rid of unnecessary hotkey code.
  • Loading branch information
lioncash committed Aug 22, 2014
2 parents 624972e + 77ce389 commit 41577f0
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions Source/Core/DolphinWX/FrameTools.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit 41577f0

Please sign in to comment.