moved wxDash typedef to gdicmn.h

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 9d88dea967b743fd963e0e9568cf2b7972619b66..971dca379cea29f4e564030143b1aef37274e66a 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -172,10 +172,10 @@ void wxListBase::DoCopy(const wxListBase& list)
     m_nodeLast = (wxNodeBase *) NULL;
 
     switch (m_keyType) {
     m_nodeLast = (wxNodeBase *) NULL;
 
     switch (m_keyType) {

-    
+

         case wxKEY_INTEGER:
             {
         case wxKEY_INTEGER:
             {

-                long key;                
+                long key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                     key = node->GetKeyInteger();
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                     key = node->GetKeyInteger();


@@ -186,7 +186,7 @@ void wxListBase::DoCopy(const wxListBase& list)
 
         case wxKEY_STRING:
             {
 
         case wxKEY_STRING:
             {

-                const wxChar *key;                
+                const wxChar *key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                     key = node->GetKeyString();
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                     key = node->GetKeyString();


@@ -578,6 +578,7 @@ void wxStringList::DoCopy(const wxStringList& other)
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {

+  DeleteContents(TRUE);

   if ( !first )
     return;
 
   if ( !first )
     return;