diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-07 19:42:01 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-07 20:22:06 -0600 |
| commit | c4df69a342bd37420b61ebe6df6a0c6af915c877 (patch) | |
| tree | d00451f654656768c1b24c94f2a99e5eb206a096 /Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | |
| parent | a2ca76ebd9c3300735c438b5ddc7bc726001b41a (diff) | |
| parent | 95d08db46fd54b37cb375980f97e1c0e11676419 (diff) | |
Merge branch 'master' into real-wiimote-scanning
Conflicts:
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
Diffstat (limited to 'Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 2917f1637d..1c0776862c 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -52,10 +52,7 @@ extern "C" // Bitmaps { - #include "../../resources/toolbar_play.c" - #include "../../resources/toolbar_pause.c" #include "../../resources/toolbar_add_memorycheck.c" - #include "../../resources/toolbar_debugger_delete.c" #include "../../resources/toolbar_add_breakpoint.c" } @@ -563,23 +560,21 @@ bool CCodeWindow::JITBlockLinking() void CCodeWindow::InitBitmaps() { // load original size 48x48 - m_Bitmaps[Toolbar_DebugGo] = wxGetBitmapFromMemory(toolbar_play_png); m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png); m_Bitmaps[Toolbar_StepOver] = 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); - m_Bitmaps[Toolbar_DebugPause] = wxGetBitmapFromMemory(toolbar_pause_png); // scale to 24x24 for toolbar - for (size_t n = Toolbar_DebugGo; n < ToolbarDebugBitmapMax; n++) + for (size_t n = 0; n < ToolbarDebugBitmapMax; n++) m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); } void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) { - int w = m_Bitmaps[Toolbar_DebugGo].GetWidth(), - h = m_Bitmaps[Toolbar_DebugGo].GetHeight(); + int w = m_Bitmaps[0].GetWidth(), + h = m_Bitmaps[0].GetHeight(); toolBar->SetToolBitmapSize(wxSize(w, h)); toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]); |