diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-09-09 17:27:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 17:27:07 +0200 |
| commit | 6e488e65e3782537e81b91696bc36dfc2edbc9f9 (patch) | |
| tree | b3ac237ea957a71b577ce30cbf134bc258b97937 /Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp | |
| parent | 586644d89ea43e7a43f74629b4b2349e9af4aa95 (diff) | |
| parent | e8cb4119b861d7d76f051f45bf2ebf5689d1c8f2 (diff) | |
Merge pull request #4013 from leoetlino/wx-assert-fix
Drop Dolphin patch to wxWidgets (and fix issues)
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 7b4909a4e8..c3d2aef98c 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -4,7 +4,6 @@ #include <cstdio> #include <wx/artprov.h> -#include <wx/aui/auibar.h> #include <wx/aui/auibook.h> #include <wx/aui/framemanager.h> #include <wx/listbox.h> @@ -20,6 +19,7 @@ #include "Core/HW/DSPLLE/DSPDebugInterface.h" #include "Core/HW/DSPLLE/DSPSymbols.h" #include "Core/Host.h" +#include "DolphinWX/AuiToolBar.h" #include "DolphinWX/Debugger/CodeView.h" #include "DolphinWX/Debugger/DSPDebugWindow.h" #include "DolphinWX/Debugger/DSPRegisterView.h" @@ -42,7 +42,7 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id) m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_Toolbar = - new wxAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT); + new DolphinAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT); m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"), wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10, 10))); m_Toolbar->AddTool(ID_STEPTOOL, _("Step"), |