fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 971dca379cea29f4e564030143b1aef37274e66a..4bdefdba206de4c34ba73b947f251673b6eb7b47 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -1,12 +1,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

-// Name:        list.cpp
+// Name:        src/common/list.cpp

 // Purpose:     wxList implementation
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxList implementation
 // Author:      Julian Smart
 // 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,9 +16,6 @@
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------

-#ifdef __GNUG__
-#pragma implementation "list.h"
-#endif

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


@@ -32,11 +29,12 @@
 #include <string.h>
 
 #ifndef WX_PRECOMP
 #include <string.h>
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/list.h"
     #include "wx/list.h"

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

 #endif
 
 #endif
 

+#if !wxUSE_STL
+

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


@@ -44,7 +42,6 @@
 // -----------------------------------------------------------------------------
 // wxListKey
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxListKey
 // -----------------------------------------------------------------------------

-

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


@@ -57,7 +54,7 @@ bool wxListKey::operator==(wxListKeyValue value) const
             // by not putting return here...
 
         case wxKEY_STRING:
             // by not putting return here...
 
         case wxKEY_STRING:

-            return wxStrcmp(m_key.string, value.string) == 0;
+            return *m_key.string == *value.string;

 
         case wxKEY_INTEGER:
             return m_key.integer == value.integer;
 
         case wxKEY_INTEGER:
             return m_key.integer == value.integer;


@@ -88,7 +85,7 @@ wxNodeBase::wxNodeBase(wxListBase *list,
 
         case wxKEY_STRING:
             // to be free()d later
 
         case wxKEY_STRING:
             // to be free()d later

-            m_key.string = wxStrdup(key.GetString());
+            m_key.string = new wxString(key.GetString());

             break;
 
         default:
             break;
 
         default:


@@ -111,7 +108,7 @@ wxNodeBase::~wxNodeBase()
     {
         if ( m_list->m_keyType == wxKEY_STRING )
         {
     {
         if ( m_list->m_keyType == wxKEY_STRING )
         {

-            free(m_key.string);
+            delete m_key.string;

         }
 
         m_list->DetachNode(this);
         }
 
         m_list->DetachNode(this);


@@ -144,9 +141,9 @@ int wxNodeBase::IndexOf() const
 void wxListBase::Init(wxKeyType keyType)
 {
   m_nodeFirst =
 void wxListBase::Init(wxKeyType keyType)
 {
   m_nodeFirst =

-  m_nodeLast = (wxNodeBase *) NULL;
+  m_nodeLast = NULL;

   m_count = 0;
   m_count = 0;

-  m_destroy = FALSE;
+  m_destroy = false;

   m_keyType = keyType;
 }
 
   m_keyType = keyType;
 }
 


@@ -165,14 +162,13 @@ 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_destroy = list.m_destroy;
     m_keyType = list.m_keyType;
     m_nodeFirst =

-    m_nodeLast = (wxNodeBase *) NULL;
-
-    switch (m_keyType) {
+    m_nodeLast = NULL;

 
 

+    switch (m_keyType)
+    {

         case wxKEY_INTEGER:
             {
                 long key;
         case wxKEY_INTEGER:
             {
                 long key;


@@ -204,6 +200,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()


@@ -238,10 +236,13 @@ wxNodeBase *wxListBase::AppendCommon(wxNodeBase *node)
 wxNodeBase *wxListBase::Append(void *object)
 {
     // all objects in a keyed list should have a key
 wxNodeBase *wxListBase::Append(void *object)
 {
     // all objects in a keyed list should have a key

-    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,

                  wxT("need a key for the object to append") );
 
                  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, NULL, object,
+                                  wxDefaultListKey);

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


@@ -250,31 +251,31 @@ wxNodeBase *wxListBase::Append(long key, void *object)
 {
     wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
 {
     wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),

-                 (wxNodeBase *)NULL,
+                 NULL,

                  wxT("can't append object with numeric key to this list") );
 
                  wxT("can't append object with numeric key to this list") );
 

-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);

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

-wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
+wxNodeBase *wxListBase::Append (const wxString& key, void *object)

 {
     wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
 {
     wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),

-                 (wxNodeBase *)NULL,
+                 NULL,

                  wxT("can't append object with string key to this list") );
 
                  wxT("can't append object with string key to this list") );
 

-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);

     return AppendCommon(node);
 }
 
 wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
 {
     // all objects in a keyed list should have a key
     return AppendCommon(node);
 }
 
 wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
 {
     // all objects in a keyed list should have a key

-    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,

                  wxT("need a key for the object to insert") );
 
                  wxT("need a key for the object to insert") );
 

-    wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
+    wxCHECK_MSG( !position || position->m_list == this, NULL,

                  wxT("can't insert before a node from another list") );
 
     // previous and next node for the node being inserted
                  wxT("can't insert before a node from another list") );
 
     // previous and next node for the node being inserted


@@ -287,11 +288,12 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
     else
     {
         // inserting in the beginning of the list
     else
     {
         // inserting in the beginning of the list

-        prev = (wxNodeBase *)NULL;
+        prev = NULL;

         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;


@@ -319,7 +321,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
 
     wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
 
 
     wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
 

-    return (wxNodeBase *)NULL;
+    return NULL;

 }
 
 wxNodeBase *wxListBase::Find(const wxListKey& key) const
 }
 
 wxNodeBase *wxListBase::Find(const wxListKey& key) const


@@ -336,10 +338,10 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const
     }
 
     // not found
     }
 
     // not found

-    return (wxNodeBase *)NULL;
+    return NULL;

 }
 
 }
 

-wxNodeBase *wxListBase::Find(void *object) const
+wxNodeBase *wxListBase::Find(const void *object) const

 {
     for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
     {
 {
     for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
     {


@@ -348,7 +350,7 @@ wxNodeBase *wxListBase::Find(void *object) const
     }
 
     // not found
     }
 
     // not found

-    return (wxNodeBase *)NULL;
+    return NULL;

 }
 
 int wxListBase::IndexOf(void *object) const
 }
 
 int wxListBase::IndexOf(void *object) const


@@ -402,11 +404,11 @@ wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
 bool wxListBase::DeleteNode(wxNodeBase *node)
 {
     if ( !DetachNode(node) )
 bool wxListBase::DeleteNode(wxNodeBase *node)
 {
     if ( !DetachNode(node) )

-        return FALSE;
+        return false;

 
     DoDeleteNode(node);
 
 
     DoDeleteNode(node);
 

-    return TRUE;
+    return true;

 }
 
 bool wxListBase::DeleteObject(void *object)
 }
 
 bool wxListBase::DeleteObject(void *object)


@@ -416,12 +418,12 @@ bool wxListBase::DeleteObject(void *object)
         if ( current->GetData() == object )
         {
             DeleteNode(current);
         if ( current->GetData() == object )
         {
             DeleteNode(current);

-            return TRUE;
+            return true;

         }
     }
 
     // not found
         }
     }
 
     // not found

-    return FALSE;
+    return false;

 }
 
 void wxListBase::Clear()
 }
 
 void wxListBase::Clear()


@@ -435,7 +437,7 @@ void wxListBase::Clear()
     }
 
     m_nodeFirst =
     }
 
     m_nodeFirst =

-    m_nodeLast = (wxNodeBase *)NULL;
+    m_nodeLast = NULL;

 
     m_count = 0;
 }
 
     m_count = 0;
 }


@@ -456,7 +458,7 @@ void *wxListBase::FirstThat(wxListIterateFunction F)
             return current->GetData();
     }
 
             return current->GetData();
     }
 

-    return (wxNodeBase *)NULL;
+    return NULL;

 }
 
 void *wxListBase::LastThat(wxListIterateFunction F)
 }
 
 void *wxListBase::LastThat(wxListIterateFunction F)


@@ -467,7 +469,7 @@ void *wxListBase::LastThat(wxListIterateFunction F)
             return current->GetData();
     }
 
             return current->GetData();
     }
 

-    return (wxNodeBase *)NULL;
+    return NULL;

 }
 
 // (stefan.hammes@urz.uni-heidelberg.de)
 }
 
 // (stefan.hammes@urz.uni-heidelberg.de)


@@ -507,17 +509,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++);
     }


@@ -526,18 +532,67 @@ 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
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+

 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 
 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 

+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 wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}

 
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves


@@ -555,12 +610,12 @@ bool wxStringList::Delete(const wxChar *s)
         if ( wxStrcmp(current->GetData(), s) == 0 )
         {
             DeleteNode(current);
         if ( wxStrcmp(current->GetData(), s) == 0 )
         {
             DeleteNode(current);

-            return TRUE;
+            return true;

         }
     }
 
     // not found
         }
     }
 
     // not found

-    return FALSE;
+    return false;

 }
 
 void wxStringList::DoCopy(const wxStringList& other)
 }
 
 void wxStringList::DoCopy(const wxStringList& other)


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

-  DeleteContents(TRUE);
+  DeleteContents(true);

   if ( !first )
     return;
 
   if ( !first )
     return;
 


@@ -590,20 +650,26 @@ wxStringList::wxStringList (const wxChar *first, ...)
   {
       Add(s);
 
   {
       Add(s);
 

+      // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+#endif
+

       s = va_arg(ap, const wxChar *);
       s = va_arg(ap, const wxChar *);

-      //    if (s == NULL)
-#ifdef __WXMSW__
-      if ((int)(long) s == 0)
-#else
-      if ((long) s == 0)
+
+#ifdef __INTELC__
+    #pragma warning(pop)

 #endif
 #endif

+
+      if ( !s )

           break;
   }
 
   va_end(ap);
 }
 
           break;
   }
 
   va_end(ap);
 }
 

-// Only makes new strings if arg is TRUE
+// Only makes new strings if arg is true

 wxChar **wxStringList::ListToArray(bool new_copies) const
 {
     wxChar **string_array = new wxChar *[GetCount()];
 wxChar **wxStringList::ListToArray(bool new_copies) const
 {
     wxChar **string_array = new wxChar *[GetCount()];


@@ -612,7 +678,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();


@@ -628,13 +694,22 @@ bool wxStringList::Member(const wxChar *s) const
     {
         const wxChar *s1 = node->GetData();
         if (s == s1 || wxStrcmp (s, s1) == 0)
     {
         const wxChar *s1 = node->GetData();
         if (s == s1 || wxStrcmp (s, s1) == 0)

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

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

 static int LINKAGEMODE
 static 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;


@@ -643,6 +718,8 @@ wx_comparestrings(const void *arg1, const void *arg2)
   return wxStrcmp (*s1, *s2);
 }
 
   return wxStrcmp (*s1, *s2);
 }
 

+}   // end of extern "C" (required because of GCC Bug c++/33078
+

 // Sort a list of strings - deallocates old nodes, allocates new
 void wxStringList::Sort()
 {
 // Sort a list of strings - deallocates old nodes, allocates new
 void wxStringList::Sort()
 {


@@ -664,3 +741,31 @@ void wxStringList::Sort()
 
     delete [] array;
 }
 
     delete [] array;
 }

+
+wxNode *wxStringList::Add(const wxChar *s)
+{
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Append(MYcopystring(s));
+}
+
+wxNode *wxStringList::Prepend(const wxChar *s)
+{
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Insert(MYcopystring(s));
+}
+
+#endif // wxLIST_COMPATIBILITY
+
+#else // wxUSE_STL = 1
+
+    #include "wx/listimpl.cpp"
+    WX_DEFINE_LIST(wxObjectList)
+
+// with wxUSE_STL wxStringList contains wxString objects, not pointers
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
+{
+}
+
+wxStringListBase::BaseListType wxStringListBase::EmptyList;
+
+#endif // !wxUSE_STL