diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 13:37:03 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 13:37:03 -0500 |
| commit | b49683b2e8b85be57221c5643376ef2d7da16bb9 (patch) | |
| tree | fbd6fd7b8b9566ad068ade21522e804892e52d8b /Source/Core/DolphinWX/Frame.cpp | |
| parent | adffa5fbeca45aa32c7b60f73517f0aa4e5b7838 (diff) | |
| parent | fd2d50535fad32facc95f2e8a35bb2f10742e83b (diff) | |
Merge pull request #3357 from JosJuice/no-xpm
DolphinWX: Stop using XPM images
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 88e3128a78..605e24e424 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); |