summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2016-11-08 20:52:45 -0500
committerLioncash <mathew1800@gmail.com>2016-11-08 21:19:24 -0500
commit2acf3570e00b370fd6f09a6794a1dcd7ee02829e (patch)
treebc6ebd45ba2591f18db14f7989c7f99c1b358aec /Source/Core/DolphinWX/FrameTools.cpp
parente05553acfc23896b710314434535e4e006373885 (diff)
PathConfigPane: Eliminate main frame global usage
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 00bc54917d..e68c2a27f9 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1072,6 +1072,11 @@ void CFrame::OnUpdateInterpreterMenuItem(wxUpdateUIEvent& event)
event.Check(SConfig::GetInstance().iCPUCore == PowerPC::CORE_INTERPRETER);
}
+void CFrame::OnUpdateLoadWiiMenuItem(wxCommandEvent& WXUNUSED(event))
+{
+ UpdateLoadWiiMenuItem();
+}
+
void CFrame::ClearStatusBar()
{
if (this->GetStatusBar()->IsEnabled())
@@ -1184,16 +1189,13 @@ void CFrame::OnInstallWAD(wxCommandEvent& event)
u64 titleID = DiscIO::CNANDContentManager::Access().Install_WiiWAD(fileName);
if (titleID == TITLEID_SYSMENU)
{
- UpdateWiiMenuChoice();
+ UpdateLoadWiiMenuItem();
}
}
-void CFrame::UpdateWiiMenuChoice(wxMenuItem* WiiMenuItem)
+void CFrame::UpdateLoadWiiMenuItem() const
{
- if (!WiiMenuItem)
- {
- WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
- }
+ auto* const WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
const DiscIO::CNANDContentLoader& SysMenu_Loader =
DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU,