more waste of time fixing uncompilable code

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 4eaf11949ecfb039fdc6c32d5f6de48e9ce66987..85448991d261d53578654e17d27446d7c37be7f4 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -37,17 +37,6 @@
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 

-// Sun CC compatibility (interference with xview/pkg.h, apparently...)
-// But XView is no longer supported.
-/*
-#if defined (SUN_CC) || defined(__SUNCC__) && defined(__XVIEW__)
-    #undef va_start
-    #undef va_end
-    #undef va_arg
-    #undef va_list
-#endif
-*/
-

 // =============================================================================
 // implementation
 // =============================================================================
 // =============================================================================
 // implementation
 // =============================================================================


@@ -56,6 +45,8 @@
 // wxListKey
 // -----------------------------------------------------------------------------
 
 // wxListKey
 // -----------------------------------------------------------------------------
 

+wxListKey wxDefaultListKey;
+

 bool wxListKey::operator==(wxListKeyValue value) const
 {
     switch ( m_keyType )
 bool wxListKey::operator==(wxListKeyValue value) const
 {
     switch ( m_keyType )


@@ -118,13 +109,18 @@ wxNodeBase::~wxNodeBase()
     // compatibility with old code
     if ( m_list != NULL )
     {
     // 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
 {
         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
 
     // It would be more efficient to implement IndexOf() completely inside
     // wxListBase (only traverse the list once), but this is probably a more


@@ -145,7 +141,7 @@ int wxNodeBase::IndexOf() const
 // wxListBase
 // -----------------------------------------------------------------------------
 
 // wxListBase
 // -----------------------------------------------------------------------------
 

-void wxListBase::Init(wxKeyType keyType = wxKEY_NONE)
+void wxListBase::Init(wxKeyType keyType)

 {
   m_nodeFirst =
   m_nodeLast = (wxNodeBase *) NULL;
 {
   m_nodeFirst =
   m_nodeLast = (wxNodeBase *) NULL;


@@ -292,7 +288,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;
 }
 
     return (wxNodeBase *)NULL;
 }


@@ -330,7 +326,7 @@ int wxListBase::IndexOf(void *object) const
 {
     wxNodeBase *node = Find( object );
 
 {
     wxNodeBase *node = Find( object );
 

-    return node ? node->IndexOf() : NOT_FOUND;
+    return node ? node->IndexOf() : wxNOT_FOUND;

 }
 
 void wxListBase::DoDeleteNode(wxNodeBase *node)
 }
 
 void wxListBase::DoDeleteNode(wxNodeBase *node)


@@ -346,6 +342,8 @@ void wxListBase::DoDeleteNode(wxNodeBase *node)
         node->DeleteData();
     }
 
         node->DeleteData();
     }
 

+    // so that the node knows that it's being deleted by the list
+    node->m_list = NULL;

     delete node;
 }
 
     delete node;
 }
 


@@ -397,7 +395,6 @@ bool wxListBase::DeleteObject(void *object)
     return FALSE;
 }
 
     return FALSE;
 }
 

-

 void wxListBase::Clear()
 {
     wxNodeBase *current = m_nodeFirst;
 void wxListBase::Clear()
 {
     wxNodeBase *current = m_nodeFirst;


@@ -520,6 +517,23 @@ void wxStringListNode::DeleteData()
     delete [] (char *)GetData();
 }
 
     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!
 void wxStringList::DoCopy(const wxStringList& other)
 {
     wxASSERT( GetCount() == 0 );    // this list must be empty before copying!


@@ -604,19 +618,20 @@ void wxStringList::Sort()
 {
     size_t N = GetCount();
     char **array = new char *[N];
 {
     size_t N = GetCount();
     char **array = new char *[N];

+    wxStringListNode *node;

 
     size_t i = 0;
 
     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);
     {
         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;

 }
 
 }