Try a blind fix for VC6 compilation issues (wxAny ctor has become too ambiguous now...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 81117ab99bcb2c94819ff2b83978bb4bde3f18c9..86c60ec187fe78c0516c11f31f173af40853d360 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -221,17 +221,18 @@ wxVariant::wxVariant(const wxAny& any)
 
 wxAny wxVariant::GetAny() const
 {
 
 wxAny wxVariant::GetAny() const
 {

+    wxAny any;
+

     if ( IsNull() )
     if ( IsNull() )

-        return wxAny();
+        return wxAny((const wxAny&)any);

 
     wxVariantData* data = GetData();
 
     wxVariantData* data = GetData();

-    wxAny any;

 
     if ( data->GetAsAny(&any) )
 
     if ( data->GetAsAny(&any) )

-        return any;
+        return wxAny((const wxAny&)any);

 
     // If everything else fails, wrap the whole wxVariantData
 
     // If everything else fails, wrap the whole wxVariantData

-    return wxAny(data);
+    return wxAny(((wxVariantData*)data));

 }
 
 #endif // wxUSE_ANY
 }
 
 #endif // wxUSE_ANY


@@ -1946,7 +1947,7 @@ bool wxVariantDataList::GetAsAny(wxAny* any) const
     while (node)
     {
         wxVariant* pVar = node->GetData();
     while (node)
     {
         wxVariant* pVar = node->GetData();

-        dst.push_back(new wxAny(*pVar));
+        dst.push_back(new wxAny(((const wxVariant&)*pVar)));

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }