ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Frame: Rename GetCmdForHotkey to GetMenuIDFromHotkey 

This more accurately describes what it's actually doing. This can also be
a local function, since it's not needed anywhere else.
This commit is contained in:
Lioncash 2016-10-18 18:09:24 -04:00
parent f871b2177e
commit 42e1dafd6d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Frame.cpp
View File

@ -866,7 +866,7 @@ static bool IsHotkey(int id, bool held = false)
return HotkeyManagerEmu::IsPressed(id, held);
}
int GetCmdForHotkey(unsigned int key)
static int GetMenuIDFromHotkey(unsigned int key)
{
switch (key)
{
@ -1288,11 +1288,11 @@ void CFrame::ParseHotkeys()
if (IsHotkey(i))
{
int cmd = GetCmdForHotkey(i);
if (cmd >= 0)
const int id = GetMenuIDFromHotkey(i);
if (id >= 0)
{
wxCommandEvent evt(wxEVT_MENU, cmd);
wxMenuItem* item = GetMenuBar()->FindItem(cmd);
wxCommandEvent evt(wxEVT_MENU, id);
wxMenuItem* item = GetMenuBar()->FindItem(id);
if (item && item->IsCheckable())
{
item->wxMenuItemBase::Toggle();

2
Source/Core/DolphinWX/Frame.h
View File

@ -342,8 +342,6 @@ private:
DECLARE_EVENT_TABLE();
};
int GetCmdForHotkey(unsigned int key);
void OnAfterLoadCallback();
void OnStoppedCallback();