No real changes, just some minor cleanup of wxDirTraverserSumSize.

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 86c60ec187fe78c0516c11f31f173af40853d360..f297b3c4d67e7f81d23968cf132380abec6cbdd5 100644 (file)
--- 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,15 +228,15 @@ wxAny wxVariant::GetAny() const
     wxAny any;
 
     if ( IsNull() )
-        return wxAny((const wxAny&)any);
+        return any;
 
     wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )
-        return wxAny((const wxAny&)any);
+        return any;
 
     // If everything else fails, wrap the whole wxVariantData
-    return wxAny(((wxVariantData*)data));
+    return wxAny(data);
 }
 
 #endif // wxUSE_ANY