X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ceb0345600301bdcc7f725c6425d9f69b33dd42..191d6608f465c8d0f263bd676adea5aec9593984:/src/common/variant.cpp?ds=sidebyside diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 86c60ec187..f297b3c4d6 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,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