diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 13:37:03 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 13:37:03 -0500 |
| commit | b49683b2e8b85be57221c5643376ef2d7da16bb9 (patch) | |
| tree | fbd6fd7b8b9566ad068ade21522e804892e52d8b /Source/Core/DolphinWX/Debugger/WatchWindow.cpp | |
| parent | adffa5fbeca45aa32c7b60f73517f0aa4e5b7838 (diff) | |
| parent | fd2d50535fad32facc95f2e8a35bb2f10742e83b (diff) | |
Merge pull request #3357 from JosJuice/no-xpm
DolphinWX: Stop using XPM images
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/WatchWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/WatchWindow.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.cpp b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp index bda75cc71e..6e6be9bfde 100644 --- a/Source/Core/DolphinWX/Debugger/WatchWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp @@ -16,10 +16,6 @@ #include "DolphinWX/Debugger/WatchView.h" #include "DolphinWX/Debugger/WatchWindow.h" -extern "C" { -#include "DolphinWX/resources/toolbar_debugger_delete.c" -} - class CWatchToolbar : public wxAuiToolBar { public: @@ -29,7 +25,7 @@ CWatchToolbar(CWatchWindow* parent, const wxWindowID id) { SetToolBitmapSize(wxSize(16, 16)); - m_Bitmaps[Toolbar_File] = wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(16, 16)); + m_Bitmaps[Toolbar_File] = WxUtils::LoadResourceBitmap("toolbar_debugger_delete"); AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_File]); Bind(wxEVT_TOOL, &CWatchWindow::Event_LoadAll, parent, ID_LOAD); |