From 019d5aee498b04963c2a38cc200d607c288c9b64 Mon Sep 17 00:00:00 2001 From: archshift Date: Fri, 8 Aug 2014 03:43:13 -0700 Subject: Changed toolbar to be static, increasing UI integration --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp') diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index dbc2e50608..4c75961715 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -128,7 +128,7 @@ wxMenuBar *CCodeWindow::GetMenuBar() return Parent->GetMenuBar(); } -wxAuiToolBar *CCodeWindow::GetToolBar() +wxToolBar *CCodeWindow::GetToolBar() { return Parent->m_ToolBarDebug; } @@ -588,7 +588,7 @@ void CCodeWindow::InitBitmaps() bitmap = wxBitmap(bitmap.ConvertToImage().Scale(24, 24)); } -void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) +void CCodeWindow::PopulateToolbar(wxToolBar* toolBar) { int w = m_Bitmaps[0].GetWidth(), h = m_Bitmaps[0].GetHeight(); @@ -625,7 +625,7 @@ void CCodeWindow::UpdateButtonStates() bool Initialized = (Core::GetState() != Core::CORE_UNINITIALIZED); bool Pause = (Core::GetState() == Core::CORE_PAUSE); bool Stepping = CCPU::IsStepping(); - wxAuiToolBar* ToolBar = GetToolBar(); + wxToolBar* ToolBar = GetToolBar(); // Toolbar if (!ToolBar) -- cgit v1.2.3 From 6cd0ebab9363f7c0335b6817379e77ddb0adb7a7 Mon Sep 17 00:00:00 2001 From: archshift Date: Fri, 8 Aug 2014 15:02:35 -0700 Subject: Included toolbar headers, preventing forward-decl errors --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp') diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 4c75961715..8e5ad2597a 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3 From b8b72861b5a608add9e23a016ee18e02d7099ddb Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 9 Aug 2014 00:42:32 -0700 Subject: Removed AuiTB, moved functions to menubar (Debug->Perspectives) --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp') diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 8e5ad2597a..0fde18f6ff 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -437,6 +437,22 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam pDebugMenu->Append(IDM_STEP, _("Step &Into\tF11")); pDebugMenu->Append(IDM_STEPOVER, _("Step &Over\tF10")); pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _("Toggle &Breakpoint\tF9")); + pDebugMenu->AppendSeparator(); + + wxMenu* pPerspectives = new wxMenu; + Parent->m_SavedPerspectives = new wxMenu; + pDebugMenu->AppendSubMenu(pPerspectives, _("Perspectives"), _("Edit Perspectives")); + pPerspectives->Append(IDM_SAVE_PERSPECTIVE, _("Save perspectives"), _("Save currently-toggled perspectives")); + pPerspectives->Append(IDM_EDIT_PERSPECTIVES, _("Edit perspectives"), _("Toggle editing of perspectives"), wxITEM_CHECK); + pPerspectives->AppendSeparator(); + pPerspectives->Append(IDM_ADD_PERSPECTIVE, _("Create new perspective")); + pPerspectives->AppendSubMenu(Parent->m_SavedPerspectives, _("Saved perspectives")); + Parent->PopulateSavedPerspectives(); + pPerspectives->AppendSeparator(); + pPerspectives->Append(IDM_PERSPECTIVES_ADD_PANE, _("Add new pane")); + pPerspectives->Append(IDM_TAB_SPLIT, _("Tab split"), "", wxITEM_CHECK); + pPerspectives->Append(IDM_NO_DOCKING, _("Disable docking"), "Disable docking of perspective panes to main window", wxITEM_CHECK); + pMenuBar->Append(pDebugMenu, _("&Debug")); -- cgit v1.2.3 From b81617fba1d618d3f0c9b645fc057645616caa1f Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 9 Aug 2014 00:56:20 -0700 Subject: Removed TBDebug, using TBMain instead. Fixed debugger assert. --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp') diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 0fde18f6ff..315bd3c962 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -131,7 +131,7 @@ wxMenuBar *CCodeWindow::GetMenuBar() wxToolBar *CCodeWindow::GetToolBar() { - return Parent->m_ToolBarDebug; + return Parent->m_ToolBar; } // ---------- -- cgit v1.2.3