Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-06 12:05:41 +00:00
parent f41d5991df
commit 986a59561a
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/any.h
View File

@@ -1007,15 +1007,12 @@ private:
// Assignment functions // Assignment functions
void AssignAny(const wxAny& any) 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; m_type = newType;
newType->CopyBuffer(any.m_buffer, m_buffer); newType->CopyBuffer(any.m_buffer, m_buffer);