X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b4092eb0b2f823ef3e37a8d9a51c3e12d1438c2..a0d8a3052817fef6eef27e9a6ab8802495a39db8:/src/common/list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 041d609db3..8bc94a8c64 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -37,13 +37,12 @@
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 
-// Sun CC compatibility (interference with xview/pkg.h, apparently...)
-#if defined(SUN_CC) && defined(__XVIEW__)
-    #undef va_start
-    #undef va_end
-    #undef va_arg
-    #undef va_list
-#endif
+// -----------------------------------------------------------------------------
+// implementation of standard lists
+// -----------------------------------------------------------------------------
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxWindowList);
 
 // =============================================================================
 // implementation
@@ -53,6 +52,8 @@
 // wxListKey
 // -----------------------------------------------------------------------------
 
+wxListKey wxDefaultListKey;
+
 bool wxListKey::operator==(wxListKeyValue value) const
 {
     switch ( m_keyType )
@@ -115,13 +116,18 @@ wxNodeBase::~wxNodeBase()
     // compatibility with old code
     if ( m_list != NULL )
     {
+        if ( m_list->m_keyType == wxKEY_STRING )
+        {
+            free(m_key.string);
+        }
+
         m_list->DetachNode(this);
     }
 }
 
 int wxNodeBase::IndexOf() const
 {
-    wxCHECK_MSG( m_list, NOT_FOUND, "node doesn't belong to a list in IndexOf");
+    wxCHECK_MSG( m_list, wxNOT_FOUND, "node doesn't belong to a list in IndexOf");
 
     // It would be more efficient to implement IndexOf() completely inside
     // wxListBase (only traverse the list once), but this is probably a more
@@ -142,7 +148,7 @@ int wxNodeBase::IndexOf() const
 // wxListBase
 // -----------------------------------------------------------------------------
 
-void wxListBase::Init(wxKeyType keyType = wxKEY_NONE)
+void wxListBase::Init(wxKeyType keyType)
 {
   m_nodeFirst =
   m_nodeLast = (wxNodeBase *) NULL;
@@ -289,7 +295,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
         }
     }
 
-//    wxFAIL_MSG( "invalid index in wxListBase::Item" );
+    wxFAIL_MSG( "invalid index in wxListBase::Item" );
 
     return (wxNodeBase *)NULL;
 }
@@ -327,7 +333,7 @@ int wxListBase::IndexOf(void *object) const
 {
     wxNodeBase *node = Find( object );
 
-    return node ? node->IndexOf() : NOT_FOUND;
+    return node ? node->IndexOf() : wxNOT_FOUND;
 }
 
 void wxListBase::DoDeleteNode(wxNodeBase *node)
@@ -343,6 +349,8 @@ void wxListBase::DoDeleteNode(wxNodeBase *node)
         node->DeleteData();
     }
 
+    // so that the node knows that it's being deleted by the list
+    node->m_list = NULL;
     delete node;
 }
 
@@ -394,7 +402,6 @@ bool wxListBase::DeleteObject(void *object)
     return FALSE;
 }
 
-
 void wxListBase::Clear()
 {
     wxNodeBase *current = m_nodeFirst;
@@ -517,6 +524,23 @@ void wxStringListNode::DeleteData()
     delete [] (char *)GetData();
 }
 
+bool wxStringList::Delete(const char *s)
+{
+    wxStringListNode *current;
+
+    for ( current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( strcmp(current->GetData(), s) == 0 )
+        {
+            DeleteNode(current);
+            return TRUE;
+        }
+    }
+
+    // not found
+    return FALSE;
+}
+
 void wxStringList::DoCopy(const wxStringList& other)
 {
     wxASSERT( GetCount() == 0 );    // this list must be empty before copying!
@@ -601,19 +625,19 @@ void wxStringList::Sort()
 {
     size_t N = GetCount();
     char **array = new char *[N];
+    wxStringListNode *node;
 
     size_t i = 0;
-    for ( wxStringListNode *node = GetFirst(); node; node = node->GetNext() )
+    for ( node = GetFirst(); node; node = node->GetNext() )
     {
         array[i++] = node->GetData();
     }
 
     qsort (array, N, sizeof (char *), wx_comparestrings);
-    Clear();
 
-    for (i = 0; i < N; i++)
-        Append (array[i]);
+    i = 0;
+    for ( node = GetFirst(); node; node = node->GetNext() )
+        node->SetData( array[i++] );
 
-    delete[]array;
+    delete [] array;
 }
-