diff options
| author | JosJuice <josjuice@gmail.com> | 2015-12-19 11:34:01 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2016-01-05 19:11:58 +0100 |
| commit | 81466d7fa3bd3fdbb4f00039342d878c4dc8aad7 (patch) | |
| tree | ca35f489a1aeebb313490cbf0d610ca2430e1268 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 460cef492a5b18dae8e9701ecbd324331b2929e3 (diff) | |
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.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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); |