Rename wxWebHistoryItem to wxWebViewHistoryItem.

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 9c5603a0faf1183187d15fc03e56819dfaed8f49..01fb9664bb76020e32abc7f3681d788e16336a41 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxList implementation
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added


@@ -17,10 +17,6 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // headers
 // -----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -33,11 +29,11 @@
 #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/crt.h"

 #endif
 
 #endif
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

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


@@ -58,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;


@@ -89,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:


@@ -112,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);


@@ -145,7 +141,7 @@ 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_destroy = false;
   m_keyType = keyType;
   m_count = 0;
   m_destroy = false;
   m_keyType = keyType;


@@ -169,28 +165,24 @@ void wxListBase::DoCopy(const wxListBase& list)
     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;
+    m_nodeLast = NULL;

 
     switch (m_keyType)
     {
         case wxKEY_INTEGER:
             {
 
     switch (m_keyType)
     {
         case wxKEY_INTEGER:
             {

-                long key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {

-                    key = node->GetKeyInteger();
-                    Append(key, node->GetData());
+                    Append(node->GetKeyInteger(), node->GetData());

                 }
                 break;
             }
 
         case wxKEY_STRING:
             {
                 }
                 break;
             }
 
         case wxKEY_STRING:
             {

-                const wxChar *key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {

-                    key = node->GetKeyString();
-                    Append(key, node->GetData());
+                    Append(node->GetKeyString(), node->GetData());

                 }
                 break;
             }
                 }
                 break;
             }


@@ -205,7 +197,7 @@ void wxListBase::DoCopy(const wxListBase& list)
             }
     }
 
             }
     }
 

-    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
+    wxASSERT_MSG( m_count == list.m_count, wxT("logic error in wxList::DoCopy") );

 }
 
 wxListBase::~wxListBase()
 }
 
 wxListBase::~wxListBase()


@@ -240,12 +232,12 @@ 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") );
 
     // we use wxDefaultListKey even though it is the default parameter value
     // because gcc under Mac OS X seems to miscompile this call otherwise
                  wxT("need a key for the object to append") );
 
     // 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,
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object,

                                   wxDefaultListKey);
 
     return AppendCommon(node);
                                   wxDefaultListKey);
 
     return AppendCommon(node);


@@ -255,31 +247,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


@@ -292,7 +284,7 @@ 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;
     }
 


@@ -325,7 +317,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


@@ -342,7 +334,7 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const
     }
 
     // not found
     }
 
     // not found

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

 }
 
 wxNodeBase *wxListBase::Find(const void *object) const
 }
 
 wxNodeBase *wxListBase::Find(const void *object) const


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

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

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


@@ -441,7 +433,7 @@ void wxListBase::Clear()
     }
 
     m_nodeFirst =
     }
 
     m_nodeFirst =

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

 
     m_count = 0;
 }
 
     m_count = 0;
 }


@@ -462,7 +454,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)


@@ -473,7 +465,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)


@@ -578,8 +570,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
-

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


@@ -594,20 +584,12 @@ void wxObjectListNode::DeleteData()
 // 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);
 }
 
 static inline wxChar* MYcopystring(const wxChar* s)
 {
     wxChar* copy = new wxChar[wxStrlen(s) + 1];
     return wxStrcpy(copy, s);
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
-

 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()


@@ -664,13 +646,19 @@ 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;
   }
 
           break;
   }
 


@@ -709,9 +697,13 @@ bool wxStringList::Member(const wxChar *s) const
 }
 
 #ifdef __WXWINCE__
 }
 
 #ifdef __WXWINCE__

-extern "C" int __cdecl
+extern "C"
+{
+static int __cdecl

 #else
 #else

-extern "C" int LINKAGEMODE
+extern "C"
+{
+static int LINKAGEMODE

 #endif
 
 wx_comparestrings(const void *arg1, const void *arg2)
 #endif
 
 wx_comparestrings(const void *arg1, const void *arg2)


@@ -722,6 +714,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()
 {


@@ -746,25 +740,28 @@ void wxStringList::Sort()
 
 wxNode *wxStringList::Add(const wxChar *s)
 {
 
 wxNode *wxStringList::Add(const wxChar *s)
 {

-    return (wxNode *)wxStringListBase::Append(MYcopystring(s));
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Append(MYcopystring(s));

 }
 
 wxNode *wxStringList::Prepend(const wxChar *s)
 {
 }
 
 wxNode *wxStringList::Prepend(const wxChar *s)
 {

-    return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Insert(MYcopystring(s));

 }
 
 #endif // wxLIST_COMPATIBILITY
 
 }
 
 #endif // wxLIST_COMPATIBILITY
 

-#else // wxUSE_STL = 1
+#else // wxUSE_STD_CONTAINERS = 1

 
 

-    #include <wx/listimpl.cpp>
-    WX_DEFINE_LIST(wxObjectList);
+    #include "wx/listimpl.cpp"
+    WX_DEFINE_LIST(wxObjectList)

 
 

-// with wxUSE_STL wxStringList contains wxString objects, not pointers
-void wxStringListBase::DeleteFunction( const wxString X )
+// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )

 {
 }
 
 {
 }
 

-#endif // !wxUSE_STL
+wxStringListBase::BaseListType wxStringListBase::EmptyList;

 
 

+#endif // !wxUSE_STD_CONTAINERS