wxVariant support for icon and bitmap should work regardless wxBitmapBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,6 +21,15 @@
|
||||
#include "wx/colour.h"
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxVariant support
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_VARIANT
|
||||
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
|
||||
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxBitmapBase
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -37,12 +46,6 @@
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
|
||||
#if wxUSE_VARIANT
|
||||
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
|
||||
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
|
||||
#endif
|
||||
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user