X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bf14ab8b14d3a999fe1159d2bec33740e066a53..bd2333878268a776100e6f14aab9a313891ba40f:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 81117ab99b..0470d2d4b3 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -206,6 +206,10 @@ wxAnyToVariantRegistration::
     wxPreRegisterAnyToVariant(this);
 }
 
+wxAnyToVariantRegistration::~wxAnyToVariantRegistration()
+{
+}
+
 wxVariant::wxVariant(const wxAny& any)
     : wxObject()
 {
@@ -224,8 +228,8 @@ wxAny wxVariant::GetAny() const
     if ( IsNull() )
         return wxAny();
 
-    wxVariantData* data = GetData();
     wxAny any;
+    wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )
         return any;
@@ -1946,7 +1950,7 @@ bool wxVariantDataList::GetAsAny(wxAny* any) const
     while (node)
     {
         wxVariant* pVar = node->GetData();
-        dst.push_back(new wxAny(*pVar));
+        dst.push_back(new wxAny(((const wxVariant&)*pVar)));
         node = node->GetNext();
     }