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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 17324c3760a3fa974a8bdda9227537468c0d981f..2ec1de8fffce013d282e52e2567a447b216171e5 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -21,6 +21,15 @@
     #include "wx/colour.h"
 #endif // WX_PRECOMP
 
     #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------


@@ -37,12 +46,6 @@
 #endif // WX_PRECOMP
 
 
 #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)
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)