From 0f8c51dfe49c98b7e77fe8a55c8fd3deafaab496 Mon Sep 17 00:00:00 2001
From: aldelaro5 <aldelaro5@gmail.com>
Date: Thu, 12 Apr 2018 01:56:15 -0400
Subject: Wx: Implement the new debugger icons

---
 Source/Core/DolphinWX/MainToolBar.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'Source/Core/DolphinWX/MainToolBar.cpp')

diff --git a/Source/Core/DolphinWX/MainToolBar.cpp b/Source/Core/DolphinWX/MainToolBar.cpp
index 9f34dcfb40..879ebeb5ec 100644
--- a/Source/Core/DolphinWX/MainToolBar.cpp
+++ b/Source/Core/DolphinWX/MainToolBar.cpp
@@ -98,13 +98,12 @@ void MainToolBar::InitializeThemeBitmaps()
 
 void MainToolBar::InitializeDebuggerBitmaps()
 {
-  m_icon_bitmaps.insert(
-      {{TOOLBAR_DEBUG_STEP, CreateDebuggerBitmap("toolbar_debugger_step")},
-       {TOOLBAR_DEBUG_STEPOVER, CreateDebuggerBitmap("toolbar_debugger_step_over")},
-       {TOOLBAR_DEBUG_STEPOUT, CreateDebuggerBitmap("toolbar_debugger_step_out")},
-       {TOOLBAR_DEBUG_SKIP, CreateDebuggerBitmap("toolbar_debugger_skip")},
-       {TOOLBAR_DEBUG_GOTOPC, CreateDebuggerBitmap("toolbar_debugger_goto_pc")},
-       {TOOLBAR_DEBUG_SETPC, CreateDebuggerBitmap("toolbar_debugger_set_pc")}});
+  m_icon_bitmaps.insert({{TOOLBAR_DEBUG_STEP, CreateBitmap("debugger_step_in")},
+                         {TOOLBAR_DEBUG_STEPOVER, CreateBitmap("debugger_step_over")},
+                         {TOOLBAR_DEBUG_STEPOUT, CreateBitmap("debugger_step_out")},
+                         {TOOLBAR_DEBUG_SKIP, CreateBitmap("debugger_skip")},
+                         {TOOLBAR_DEBUG_GOTOPC, CreateBitmap("debugger_show_pc")},
+                         {TOOLBAR_DEBUG_SETPC, CreateBitmap("debugger_set_pc")}});
 }
 
 wxBitmap MainToolBar::CreateBitmap(const std::string& name) const
@@ -112,14 +111,6 @@ wxBitmap MainToolBar::CreateBitmap(const std::string& name) const
   return WxUtils::LoadScaledThemeBitmap(name, this, GetToolBitmapSize());
 }
 
-wxBitmap MainToolBar::CreateDebuggerBitmap(const std::string& name) const
-{
-  constexpr auto scale_flags = WxUtils::LSI_SCALE_DOWN | WxUtils::LSI_ALIGN_CENTER;
-
-  return WxUtils::LoadScaledResourceBitmap(name, this, GetToolBitmapSize(), wxDefaultSize,
-                                           scale_flags);
-}
-
 void MainToolBar::ApplyThemeBitmaps()
 {
   constexpr std::array<std::pair<int, ToolBarBitmapID>, 8> bitmap_entries{
-- 
cgit v1.2.3