mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-26 09:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed TBDebug, using TBMain instead. Fixed debugger assert.

Browse Source
This commit is contained in:
archshift 2014-08-09 00:56:20 -07:00
parent b8b72861b5
commit b81617fba1
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -131,7 +131,7 @@ wxMenuBar *CCodeWindow::GetMenuBar()
wxToolBar *CCodeWindow::GetToolBar() wxToolBar *CCodeWindow::GetToolBar()
{ {
return Parent->m_ToolBarDebug; return Parent->m_ToolBar;
} }
// ---------- // ----------

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

@ -307,8 +307,7 @@ CFrame::CFrame(wxFrame* parent,
long style) long style)
: CRenderFrame(parent, id, title, pos, size, style) : CRenderFrame(parent, id, title, pos, size, style)
, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr) , g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr)
, m_ToolBar(nullptr), m_ToolBarDebug(nullptr) , m_ToolBar(nullptr), m_SavedPerspectives(nullptr)
, m_SavedPerspectives(nullptr)
, m_GameListCtrl(nullptr), m_Panel(nullptr) , m_GameListCtrl(nullptr), m_Panel(nullptr)
, m_RenderFrame(nullptr), m_RenderParent(nullptr) , m_RenderFrame(nullptr), m_RenderParent(nullptr)
, m_LogWindow(nullptr), m_LogConfigWindow(nullptr) , m_LogWindow(nullptr), m_LogConfigWindow(nullptr)

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

@ -139,7 +139,7 @@ public:
wxMenu* m_SavedPerspectives; wxMenu* m_SavedPerspectives;
wxToolBar *m_ToolBar, *m_ToolBarDebug; wxToolBar *m_ToolBar;
// AUI // AUI
wxAuiManager *m_Mgr; wxAuiManager *m_Mgr;
bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1]; bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];

17
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -540,15 +540,18 @@ void CFrame::RecreateToolbar()
long TOOLBAR_STYLE = wxTB_DEFAULT_STYLE | wxTB_TEXT; long TOOLBAR_STYLE = wxTB_DEFAULT_STYLE | wxTB_TEXT;
if (g_pCodeWindow && !m_ToolBarDebug) if (!m_ToolBar)
{ {
m_ToolBarDebug = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBDebug"); m_ToolBar = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBMain");
g_pCodeWindow->PopulateToolbar(m_ToolBarDebug);
m_ToolBarDebug->AddSeparator();
}
m_ToolBar = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBMain"); if (g_pCodeWindow)
PopulateToolbar(m_ToolBar); {
g_pCodeWindow->PopulateToolbar(m_ToolBar);
m_ToolBar->AddSeparator();
}
PopulateToolbar(m_ToolBar);
}
UpdateGUI(); UpdateGUI();
} }