Define wxICON_IS_BITMAP when this is indeed the case
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:
@@ -401,6 +401,9 @@ more details.
|
|||||||
defined when compiling code which uses wxWidgets as a DLL/shared library}
|
defined when compiling code which uses wxWidgets as a DLL/shared library}
|
||||||
@itemdef{WXBUILDING,
|
@itemdef{WXBUILDING,
|
||||||
defined when building wxWidgets itself, whether as a static or shared library}
|
defined when building wxWidgets itself, whether as a static or shared library}
|
||||||
|
@itemdef{wxICON_IS_BITMAP,
|
||||||
|
defined in the ports where wxIcon inherits from wxBitmap (all but
|
||||||
|
wxMSW currently)}
|
||||||
@endDefList
|
@endDefList
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@@ -25,6 +25,8 @@
|
|||||||
#if defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
|
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
|
||||||
#include "wx/msw/icon.h"
|
#include "wx/msw/icon.h"
|
||||||
|
|
||||||
|
#define wxICON_DIFFERENT_FROM_BITMAP
|
||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__)
|
||||||
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
||||||
#include "wx/motif/icon.h"
|
#include "wx/motif/icon.h"
|
||||||
@@ -58,6 +60,10 @@
|
|||||||
#include "wx/generic/icon.h"
|
#include "wx/generic/icon.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef wxICON_DIFFERENT_FROM_BITMAP
|
||||||
|
#define wxICON_IS_BITMAP
|
||||||
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// wxVariant support
|
// wxVariant support
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user