CodeWindow: Rename GetMenuBar() to GetParentMenuBar()
This commit is contained in:
parent
07e3835a49
commit
9543b9d20d
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue