From 9543b9d20d3a4557ff6112e38e28cd2cdac16ac1 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 4 Nov 2016 22:02:36 -0400
Subject: [PATCH] CodeWindow: Rename GetMenuBar() to GetParentMenuBar()

---
 Source/Core/DolphinWX/Debugger/CodeWindow.cpp        | 12 ++++++------
 Source/Core/DolphinWX/Debugger/CodeWindow.h          |  3 +--
 .../Core/DolphinWX/Debugger/CodeWindowFunctions.cpp  | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
index a801d59e8b..c39efe0047 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
@@ -132,7 +132,7 @@ CCodeWindow::~CCodeWindow()
   m_aui_manager.UnInit();
 }
 
-wxMenuBar* CCodeWindow::GetMenuBar()
+wxMenuBar* CCodeWindow::GetParentMenuBar()
 {
   return Parent->GetMenuBar();
 }
@@ -539,27 +539,27 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event)
 // Shortcuts
 bool CCodeWindow::UseInterpreter()
 {
-  return GetMenuBar()->IsChecked(IDM_INTERPRETER);
+  return GetParentMenuBar()->IsChecked(IDM_INTERPRETER);
 }
 
 bool CCodeWindow::BootToPause()
 {
-  return GetMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE);
+  return GetParentMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE);
 }
 
 bool CCodeWindow::AutomaticStart()
 {
-  return GetMenuBar()->IsChecked(IDM_AUTOMATIC_START);
+  return GetParentMenuBar()->IsChecked(IDM_AUTOMATIC_START);
 }
 
 bool CCodeWindow::JITNoBlockCache()
 {
-  return GetMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_CACHE);
+  return GetParentMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_CACHE);
 }
 
 bool CCodeWindow::JITNoBlockLinking()
 {
-  return GetMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_LINKING);
+  return GetParentMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_LINKING);
 }
 
 // Update GUI
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h
index e320d9ff39..b3f5bca191 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindow.h
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h
@@ -123,8 +123,7 @@ public:
   int iNbAffiliation[IDM_DEBUG_WINDOW_LIST_END - IDM_DEBUG_WINDOW_LIST_START];
 
 private:
-  // Parent interaction
-  wxMenuBar* GetMenuBar();
+  wxMenuBar* GetParentMenuBar();
 
   void OnCPUMode(wxCommandEvent& event);
 
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
index e4a0b37da7..3206721851 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
+++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
@@ -93,8 +93,8 @@ void CCodeWindow::Save()
 
   IniFile::Section* general = ini.GetOrCreateSection("General");
   general->Set("DebuggerFont", WxStrToStr(DebuggerFont.GetNativeFontInfoUserDesc()));
-  general->Set("AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATIC_START));
-  general->Set("BootToPause", GetMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE));
+  general->Set("AutomaticStart", GetParentMenuBar()->IsChecked(IDM_AUTOMATIC_START));
+  general->Set("BootToPause", GetParentMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE));
 
   const char* SettingName[] = {"Log",    "LogConfig", "Console", "Registers", "Breakpoints",
                                "Memory", "JIT",       "Sound",   "Video",     "Code"};
@@ -102,7 +102,7 @@ void CCodeWindow::Save()
   // Save windows settings
   for (int i = IDM_LOG_WINDOW; i <= IDM_VIDEO_WINDOW; i++)
     ini.GetOrCreateSection("ShowOnStart")
-        ->Set(SettingName[i - IDM_LOG_WINDOW], GetMenuBar()->IsChecked(i));
+        ->Set(SettingName[i - IDM_LOG_WINDOW], GetParentMenuBar()->IsChecked(i));
 
   // Save notebook affiliations
   std::string section = "P - " + Parent->Perspectives[Parent->ActivePerspective].Name;
@@ -125,7 +125,7 @@ void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
     Core::SetState(Core::CORE_PAUSE);
     if (jit != nullptr)
       jit->ClearCache();
-    Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILE_BLOCKS);
+    Profiler::g_ProfileBlocks = GetParentMenuBar()->IsChecked(IDM_PROFILE_BLOCKS);
     Core::SetState(Core::CORE_RUN);
     break;
   case IDM_WRITE_PROFILE:
@@ -467,7 +467,7 @@ void CCodeWindow::TogglePanel(int id, bool show)
   wxPanel* panel = GetUntypedPanel(id);
 
   // Not all the panels (i.e. CodeWindow) have corresponding menu options.
-  wxMenuItem* item = GetMenuBar()->FindItem(id);
+  wxMenuItem* item = GetParentMenuBar()->FindItem(id);
   if (item)
     item->Check(show);