Fix wxAny for VC6 by removing 'wxAny& operator=(const wxVariant &variant)' for it. This will break some cases of implicit wxVariant->wxAny conversion (for VC6).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-18 11:15:26 +00:00
parent a286080b4f
commit 0aaed451fd
4 changed files with 34 additions and 15 deletions
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -225,11 +225,10 @@ wxVariant::wxVariant(const wxAny& any)

 wxAny wxVariant::GetAny() const
 {
-    wxAny any;
-
    if ( IsNull() )
-        return any;
+        return wxAny();

+    wxAny any;
    wxVariantData* data = GetData();

    if ( data->GetAsAny(&any) )