fixed bug in parsing filenames without paths, added more/better tests

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 9d88dea967b743fd963e0e9568cf2b7972619b66..1d647ddd273249276ef893ca71eaa872492513b7 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -16,8 +16,9 @@
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------

+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "list.h"
+    #pragma implementation "list.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -165,17 +166,16 @@ void wxListBase::DoCopy(const wxListBase& list)
     wxASSERT_MSG( !list.m_destroy,
                   wxT("copying list which owns it's elements is a bad idea") );
 
     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 =
     m_nodeLast = (wxNodeBase *) NULL;
 
     m_destroy = list.m_destroy;
     m_keyType = list.m_keyType;
     m_nodeFirst =
     m_nodeLast = (wxNodeBase *) NULL;
 

-    switch (m_keyType) {
-    
+    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();


@@ -204,6 +204,8 @@ void wxListBase::DoCopy(const wxListBase& list)
                 break;
             }
     }
                 break;
             }
     }

+
+    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );

 }
 
 wxListBase::~wxListBase()
 }
 
 wxListBase::~wxListBase()


@@ -241,7 +243,10 @@ wxNodeBase *wxListBase::Append(void *object)
     wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
                  wxT("need a key for the object to append") );
 
     wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
                  wxT("need a key for the object to append") );
 

-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object);
+    // we use wxDefaultListKey even though it is the default parameter value
+    // because gcc under Mac OS X seems to miscompile this call otherwise
+    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
+                                  wxDefaultListKey);

 
     return AppendCommon(node);
 }
 
     return AppendCommon(node);
 }


@@ -291,7 +296,8 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
         next = m_nodeFirst;
     }
 
         next = m_nodeFirst;
     }
 

-    wxNodeBase *node = CreateNode(prev, next, object);
+    // wxDefaultListKey: see comment in Append() above
+    wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);

     if ( !m_nodeFirst )
     {
         m_nodeLast = node;
     if ( !m_nodeFirst )
     {
         m_nodeLast = node;


@@ -578,6 +584,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;