From 81466d7fa3bd3fdbb4f00039342d878c4dc8aad7 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 19 Dec 2015 11:34:01 +0100 Subject: DolphinWX: Stop using XPM images Using the XPM format for images has become a maintenance problem because people don't know how to create them. This commit removes all XPM images and all C files that contain PNG images. DolphinWX now uses the PNGs in the Resources folder instead, just like DolphinQt and DolphinQt2 do. --- Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp') diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp index 657eab73e0..a86920cf09 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp @@ -23,12 +23,6 @@ #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/MemoryCheckDlg.h" -extern "C" { -#include "DolphinWX/resources/toolbar_add_breakpoint.c" -#include "DolphinWX/resources/toolbar_add_memorycheck.c" -#include "DolphinWX/resources/toolbar_debugger_delete.c" -} - class CBreakPointBar : public wxAuiToolBar { public: @@ -38,9 +32,9 @@ public: { SetToolBitmapSize(wxSize(24, 24)); - m_Bitmaps[Toolbar_Delete] = wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(16, 16)); - m_Bitmaps[Toolbar_Add_BP] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(16, 16)); - m_Bitmaps[Toolbar_Add_MC] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(16, 16)); + m_Bitmaps[Toolbar_Delete] = WxUtils::LoadResourceBitmap("toolbar_debugger_delete"); + m_Bitmaps[Toolbar_Add_BP] = WxUtils::LoadResourceBitmap("toolbar_add_breakpoint"); + m_Bitmaps[Toolbar_Add_MC] = WxUtils::LoadResourceBitmap("toolbar_add_memorycheck"); AddTool(ID_DELETE, _("Delete"), m_Bitmaps[Toolbar_Delete]); Bind(wxEVT_TOOL, &CBreakPointWindow::OnDelete, parent, ID_DELETE); -- cgit v1.2.3