X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/list.cpp?ds=sidebyside

diff --git a/src/common/list.cpp b/src/common/list.cpp
index e442699d80..b9c9e06388 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 ////////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
@@ -16,8 +16,9 @@
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "list.h"
+    #pragma implementation "list.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -165,16 +166,46 @@ 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 =
     m_nodeLast = (wxNodeBase *) NULL;
 
-    for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+    switch (m_keyType)
     {
-        Append(node);
+        case wxKEY_INTEGER:
+            {
+                long key;
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    key = node->GetKeyInteger();
+                    Append(key, node->GetData());
+                }
+                break;
+            }
+
+        case wxKEY_STRING:
+            {
+                const wxChar *key;
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    key = node->GetKeyString();
+                    Append(key, node->GetData());
+                }
+                break;
+            }
+
+        default:
+            {
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    Append(node->GetData());
+                }
+                break;
+            }
     }
+
+    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
 }
 
 wxListBase::~wxListBase()
@@ -212,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") );
 
-    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);
 }
@@ -262,7 +296,8 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
         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;
@@ -478,9 +513,9 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
 
     // go through the list and put the pointers into the array
     wxNodeBase *node;
-    for ( node = GetFirst(); node; node = node->Next() )
+    for ( node = GetFirst(); node; node = node->GetNext() )
     {
-        *objPtr++ = node->Data();
+        *objPtr++ = node->GetData();
     }
 
     // sort the array
@@ -488,7 +523,7 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
 
     // put the sorted pointers back into the list
     objPtr = objArray;
-    for ( node = GetFirst(); node; node = node->Next() )
+    for ( node = GetFirst(); node; node = node->GetNext() )
     {
         node->SetData(*objPtr++);
     }
@@ -497,10 +532,41 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
     delete[] objArray;
 }
 
+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+
+// -----------------------------------------------------------------------------
+// wxNodeBase deprecated methods
+// -----------------------------------------------------------------------------
+
+wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); }
+wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); }
+wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); }
+
+// -----------------------------------------------------------------------------
+// wxListBase deprecated methods
+// -----------------------------------------------------------------------------
+
+int wxListBase::Number() const { return GetCount(); }
+wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
+wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); }
+wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); }
+wxListBase::operator wxList&() const { return *(wxList*)this; }
+
 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+
+wxList::wxList( int key_type )
+    : wxObjectList( (wxKeyType)key_type )
+{
+}
+
 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();
@@ -510,6 +576,8 @@ void wxObjectListNode::DeleteData()
 // wxStringList
 // -----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()
@@ -545,10 +613,16 @@ void wxStringList::DoCopy(const wxStringList& other)
     }
 }
 
+wxStringList::wxStringList()
+{
+    DeleteContents(TRUE);
+}
+
 // Variable argument list, terminated by a zero
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {
+  DeleteContents(TRUE);
   if ( !first )
     return;
 
@@ -604,7 +678,7 @@ bool wxStringList::Member(const wxChar *s) const
     return FALSE;
 }
 
-static int LINKAGEMODE
+extern "C" int LINKAGEMODE
 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;
@@ -634,3 +708,6 @@ void wxStringList::Sort()
 
     delete [] array;
 }
+
+#endif // wxLIST_COMPATIBILITY
+