mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 15:31:17 +01:00
Merge pull request #844 from lioncash/wx-hotkey
DolphinWX: Get rid of unnecessary hotkey code.
This commit is contained in:
commit
41577f044a
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user