From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 2 Oct 2006 07:58:53 +0000 (+0000)
Subject: wxVariant support for icon and bitmap should work regardless wxBitmapBase.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bae328c1ffa6005fbbdbbf862b3db6c648c2f004

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 17324c3760..2ec1de8fff 100644
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -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)