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/Frame.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 4972bb6b4e..0da8c9ecfb 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -58,12 +58,6 @@ #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" -// Resources - -extern "C" { -#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon -}; - int g_saveSlot = 1; #if defined(HAVE_X11) && HAVE_X11 @@ -89,7 +83,7 @@ CRenderFrame::CRenderFrame(wxFrame* parent, wxWindowID id, const wxString& title { // Give it an icon wxIcon IconTemp; - IconTemp.CopyFromBitmap(wxGetBitmapFromMemory(Dolphin_png)); + IconTemp.CopyFromBitmap(WxUtils::LoadResourceBitmap("Dolphin")); SetIcon(IconTemp); DragAcceptFiles(true); -- cgit v1.2.3