reverting AssignAny fix, not needed if wxAny is not instantiated during static global...

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

diff --git a/include/wx/any.h b/include/wx/any.h
index 614cb09db75eeccb832363d05923e31b37426eca..511239f1111f95fe27a3049b63c735881e07b7f3 100644 (file)
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -1007,15 +1007,12 @@ private:
     // Assignment functions
     void AssignAny(const wxAny& any)
     {
     // Assignment functions
     void AssignAny(const wxAny& any)
     {

-        if ( m_type != wxAnyNullValueType )
-        {
-            // Must delete value - CopyBuffer() never does that
-            m_type->DeleteValue(m_buffer);
-        }
+        // Must delete value - CopyBuffer() never does that
+        m_type->DeleteValue(m_buffer);

 
         wxAnyValueType* newType = any.m_type;
 
 
         wxAnyValueType* newType = any.m_type;
 

-        if ( m_type == wxAnyNullValueType || !newType->IsSameType(m_type) )
+        if ( !newType->IsSameType(m_type) )

             m_type = newType;
 
         newType->CopyBuffer(any.m_buffer, m_buffer);
             m_type = newType;
 
         newType->CopyBuffer(any.m_buffer, m_buffer);