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/CodeWindow.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/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index beb343318d..95f13d0603 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -8,7 +8,6 @@ // clang-format off #include <wx/bitmap.h> -#include <wx/aui/auibar.h> #include <wx/image.h> #include <wx/listbox.h> #include <wx/menu.h> @@ -19,6 +18,7 @@ #include <wx/textdlg.h> #include <wx/thread.h> #include <wx/toolbar.h> +#include <wx/aui/auibar.h> #include <wx/aui/dockart.h> // clang-format on @@ -45,6 +45,7 @@ #include "DolphinWX/Debugger/JitWindow.h" #include "DolphinWX/Debugger/RegisterWindow.h" #include "DolphinWX/Debugger/WatchWindow.h" +#include "DolphinWX/AuiToolBar.h" #include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" @@ -74,8 +75,8 @@ CCodeWindow::CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame* pare callers = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT); callers->Bind(wxEVT_LISTBOX, &CCodeWindow::OnCallersListChange, this); - m_aui_toolbar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxAUI_TB_HORIZONTAL | wxAUI_TB_PLAIN_BACKGROUND); + m_aui_toolbar = new DolphinAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxAUI_TB_HORIZONTAL | wxAUI_TB_PLAIN_BACKGROUND); wxSearchCtrl* const address_searchctrl = new wxSearchCtrl(m_aui_toolbar, IDM_ADDRBOX); address_searchctrl->Bind(wxEVT_TEXT, &CCodeWindow::OnAddrBoxChange, this); |