diff options
| author | archshift <admin@archshift.com> | 2014-08-08 03:43:13 -0700 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-08-08 03:43:13 -0700 |
| commit | 019d5aee498b04963c2a38cc200d607c288c9b64 (patch) | |
| tree | 0ef58f09eba79ad269e6a94b3d626b29b995c883 /Source/Core/DolphinWX/Debugger/CodeWindow.cpp | |
| parent | b38022df437d9bc1938f5b23cdbd9b92f85cd18b (diff) | |
Changed toolbar to be static, increasing UI integration
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) |