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/WatchWindow.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Source/Core/DolphinWX/Debugger/WatchWindow.cpp') 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); -- cgit v1.2.3