make construct simpler

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index e94aa517a827b61ba52324dec3c76594d229af5f..26ace46fb5b4336265a0850f104e8c7d435d4f25 100644 (file)
--- 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$
 // 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

 ////////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================
 ////////////////////////////////////////////////////////////////////////////////
 
 // =============================================================================


@@ -17,7 +17,7 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // headers
 // -----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "list.h"
 #endif
 
     #pragma implementation "list.h"
 #endif
 


@@ -35,9 +35,10 @@
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/list.h"

-    #include "wx/utils.h"   // for copystring() (beurk...)

 #endif
 
 #endif
 

+#if !wxUSE_STL
+

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


@@ -45,7 +46,6 @@
 // -----------------------------------------------------------------------------
 // wxListKey
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxListKey
 // -----------------------------------------------------------------------------

-

 wxListKey wxDefaultListKey;
 
 bool wxListKey::operator==(wxListKeyValue value) const
 wxListKey wxDefaultListKey;
 
 bool wxListKey::operator==(wxListKeyValue value) const


@@ -513,17 +513,21 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
 
     // go through the list and put the pointers into the array
     wxNodeBase *node;
 
     // 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
     }
 
     // sort the array

-    qsort((void *)objArray,num,sizeof(wxObject *),compfunc);
+    qsort((void *)objArray,num,sizeof(wxObject *),
+#ifdef __WXWINCE__
+        (int (__cdecl *)(const void *,const void *))
+#endif
+        compfunc);

 
     // put the sorted pointers back into the list
     objPtr = objArray;
 
     // 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++);
     }
     {
         node->SetData(*objPtr++);
     }


@@ -532,6 +536,38 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
     delete[] objArray;
 }
 
     delete[] objArray;
 }
 

+void wxListBase::Reverse()
+{
+    wxNodeBase* node = m_nodeFirst;
+    wxNodeBase* tmp;
+
+    while (node)
+    {
+        // swap prev and next pointers
+        tmp = node->m_next;
+        node->m_next = node->m_previous;
+        node->m_previous = tmp;
+
+        // this is the node that was next before swapping
+        node = tmp;
+    }
+
+    // swap first and last node
+    tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp;
+}
+
+void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
+{
+    wxNodeBase* node = first;
+
+    while (node != last)
+    {
+        wxNodeBase* next = node->GetNext();
+        DeleteNode(node);
+        node = next;
+    }
+}
+

 // ============================================================================
 // compatibility section from now on
 // ============================================================================
 // ============================================================================
 // compatibility section from now on
 // ============================================================================


@@ -544,14 +580,31 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
 
 IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
 

+wxList::wxList( int key_type )
+    : wxObjectList( (wxKeyType)key_type )
+{
+}
+

 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();
 }
 
 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();
 }
 

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxStringList
 // wxStringList

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}

 
 IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
 


@@ -590,6 +643,11 @@ 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, ...)
 // Variable argument list, terminated by a zero
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)


@@ -628,7 +686,7 @@ wxChar **wxStringList::ListToArray(bool new_copies) const
     {
         wxChar *s = node->GetData();
         if ( new_copies )
     {
         wxChar *s = node->GetData();
         if ( new_copies )

-            string_array[i] = copystring(s);
+            string_array[i] = MYcopystring(s);

         else
             string_array[i] = s;
         node = node->GetNext();
         else
             string_array[i] = s;
         node = node->GetNext();


@@ -650,7 +708,12 @@ bool wxStringList::Member(const wxChar *s) const
     return FALSE;
 }
 
     return FALSE;
 }
 

+#ifdef __WXWINCE__
+extern "C" int __cdecl
+#else

 extern "C" int LINKAGEMODE
 extern "C" int LINKAGEMODE

+#endif
+

 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;
 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;


@@ -681,5 +744,16 @@ void wxStringList::Sort()
     delete [] array;
 }
 
     delete [] array;
 }
 

+wxNode *wxStringList::Add(const wxChar *s)
+{
+    return (wxNode *)wxStringListBase::Append(MYcopystring(s));
+}
+        
+wxNode *wxStringList::Prepend(const wxChar *s)
+{
+    return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
+}
+

 #endif // wxLIST_COMPATIBILITY
 
 #endif // wxLIST_COMPATIBILITY
 

+#endif // !wxUSE_STL