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

DolphinWX: Remove HAVE_WX preprocessor define

Browse Source 
I think we don't have to double check it when building the WX target.
This commit is contained in:
Florent Castelli
2017-01-24 03:53:47 +01:00
parent 0baf1c78c0
commit a917d247ed
6 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/ISOFile.h
View File

@ -11,10 +11,8 @@
#include "Common/Common.h"
#if defined(HAVE_WX) && HAVE_WX
#include <wx/bitmap.h>
#include <wx/image.h>
#endif
namespace DiscIO
{
@ -60,12 +58,9 @@ public:
u64 GetVolumeSize() const { return m_VolumeSize; }
// 0 is the first disc, 1 is the second disc
u8 GetDiscNumber() const { return m_disc_number; }
#if defined(HAVE_WX) && HAVE_WX
// NOTE: Banner image is at the original resolution, use WxUtils::ScaleImageToBitmap
// to display it
const wxImage& GetBannerImage() const { return m_image; }
#endif
void DoState(PointerWrap& p);
private:
@ -90,9 +85,7 @@ private:
DiscIO::BlobType m_blob_type;
u16 m_Revision;
#if defined(HAVE_WX) && HAVE_WX
wxImage m_image;
#endif
bool m_Valid;
std::vector<u8> m_pImage;
int m_ImageWidth, m_ImageHeight;