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/WatchWindow.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/WatchWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/WatchWindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.cpp b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp index ce92d7e656..f43190a5d3 100644 --- a/Source/Core/DolphinWX/Debugger/WatchWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp @@ -6,7 +6,6 @@ // clang-format off #include <wx/bitmap.h> -#include <wx/aui/auibar.h> #include <wx/panel.h> // clang-format on @@ -16,14 +15,15 @@ #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Debugger/WatchView.h" #include "DolphinWX/Debugger/WatchWindow.h" +#include "DolphinWX/AuiToolBar.h" #include "DolphinWX/WxUtils.h" -class CWatchToolbar : public wxAuiToolBar +class CWatchToolbar : public DolphinAuiToolBar { public: CWatchToolbar(CWatchWindow* parent, const wxWindowID id) - : wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, - wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT) + : DolphinAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, + wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT) { SetToolBitmapSize(wxSize(16, 16)); |
