Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define wxICON_IS_BITMAP when this is indeed the case

Browse Source 
This symbol is useful for testing if wxIcon can be just converted to
wxBitmap, as is the case in all ports except for wxMSW currently.
This commit is contained in:
Vadim Zeitlin
2021-10-21 18:14:01 +01:00
parent e126ddc11c
commit 5773a8736c
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/icon.h
View File

@@ -25,6 +25,8 @@
#if defined(__WXMSW__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
#include "wx/msw/icon.h"
#define wxICON_DIFFERENT_FROM_BITMAP
#elif defined(__WXMOTIF__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/motif/icon.h"
@@ -58,6 +60,10 @@
#include "wx/generic/icon.h"
#endif
#ifndef wxICON_DIFFERENT_FROM_BITMAP
#define wxICON_IS_BITMAP
#endif
//-----------------------------------------------------------------------------
// wxVariant support
//-----------------------------------------------------------------------------