Fixed problems with the wxDb::Open(wxDb *copyDb) not copying in all the different...

[wxWidgets.git] / src / common / list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index b56beb3dec4353f54f3438e49816f5fd27462227..0e326ee1f5638d2af008b8f2f32b7b6a9ae9eb0f 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -165,7 +165,6 @@ void wxListBase::DoCopy(const wxListBase& list)
     wxASSERT_MSG( !list.m_destroy,
                   wxT("copying list which owns it's elements is a bad idea") );
 
-    m_count = list.m_count;
     m_destroy = list.m_destroy;
     m_keyType = list.m_keyType;
     m_nodeFirst =
@@ -204,6 +203,8 @@ void wxListBase::DoCopy(const wxListBase& list)
                 break;
             }
     }
+
+    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
 }
 
 wxListBase::~wxListBase()
@@ -578,6 +579,7 @@ void wxStringList::DoCopy(const wxStringList& other)
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {
+  DeleteContents(TRUE);
   if ( !first )
     return;