piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3357 from JosJuice/no-xpm

Browse Source 
DolphinWX: Stop using XPM images
This commit is contained in:
Ryan Houdek
2016-01-06 13:37:03 -05:00
parent adffa5fbec fd2d50535f
commit b49683b2e8
71 changed files with 84 additions and 4657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Frame.cpp
View File

@ -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);