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

Upgrade WX to r74856, mainly to support @2x.

Browse Source
This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Externals/wxWidgets3/include/wx/icon.h vendored
View File

@ -5,7 +5,6 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: icon.h 70353 2012-01-15 14:46:41Z VZ $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -30,7 +29,11 @@
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/motif/icon.h"
#elif defined(__WXGTK20__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#ifdef __WINDOWS__
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
#else
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#endif
#include "wx/generic/icon.h"
#elif defined(__WXGTK__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM