From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 6 Jan 2011 12:05:41 +0000 (+0000)
Subject: reverting AssignAny fix, not needed if wxAny is not instantiated during static global... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/986a59561ab32013ae67a243a02099e64f0a4ae1

reverting AssignAny fix, not needed if wxAny is not instantiated during static globals init

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 614cb09db7..511239f111 100644
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -1007,15 +1007,12 @@ private:
     // 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;
 
-        if ( m_type == wxAnyNullValueType || !newType->IsSameType(m_type) )
+        if ( !newType->IsSameType(m_type) )
             m_type = newType;
 
         newType->CopyBuffer(any.m_buffer, m_buffer);