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/CodeWindow.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/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index ca38129b9c..527738387d 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -45,12 +45,6 @@ #include "DolphinWX/Debugger/RegisterWindow.h" #include "DolphinWX/Debugger/WatchWindow.h" -extern "C" // Bitmaps -{ - #include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT - #include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT -} - CCodeWindow::CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame *parent, wxWindowID id, const wxPoint& position, const wxSize& size, long style, const wxString& name) : wxPanel(parent, id, position, size, style, name) @@ -654,17 +648,12 @@ bool CCodeWindow::JITNoBlockLinking() // Toolbar void CCodeWindow::InitBitmaps() { - // load original size 48x48 - m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png); - m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_StepOut] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - - // scale to 24x24 for toolbar - for (auto& bitmap : m_Bitmaps) - bitmap = wxBitmap(bitmap.ConvertToImage().Scale(24, 24)); + m_Bitmaps[Toolbar_Step] = WxUtils::LoadResourceBitmap("toolbar_debugger_step"); + m_Bitmaps[Toolbar_StepOver] = WxUtils::LoadResourceBitmap("toolbar_debugger_step_over"); + m_Bitmaps[Toolbar_StepOut] = WxUtils::LoadResourceBitmap("toolbar_debugger_step_out"); + m_Bitmaps[Toolbar_Skip] = WxUtils::LoadResourceBitmap("toolbar_debugger_skip"); + m_Bitmaps[Toolbar_GotoPC] = WxUtils::LoadResourceBitmap("toolbar_debugger_goto_pc"); + m_Bitmaps[Toolbar_SetPC] = WxUtils::LoadResourceBitmap("toolbar_debugger_set_pc"); } void CCodeWindow::PopulateToolbar(wxToolBar* toolBar) |