added vendor display name (for consistency with app display name &c) (patch 1831303)

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 42368c0e512aeee8ec2c52ec8e73e1a69fa373fa..15535b3552a7a47a698b796124b5bc47b18a30d5 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


@@ -29,8 +29,8 @@
 #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
 
 #if !wxUSE_STL
 #endif
 
 #if !wxUSE_STL


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


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


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


@@ -258,7 +258,7 @@ wxNodeBase *wxListBase::Append(long key, void *object)
     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),


@@ -574,8 +574,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 )
 {


@@ -596,8 +594,6 @@ static inline wxChar* MYcopystring(const wxChar* s)
     return wxStrcpy(copy, s);
 }
 
     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()


@@ -742,25 +738,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
 
 #else // wxUSE_STL = 1
 
 }
 
 #endif // wxLIST_COMPATIBILITY
 
 #else // wxUSE_STL = 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
 
 // with wxUSE_STL wxStringList contains wxString objects, not pointers

-void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )

 {
 }
 
 {
 }
 

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

 
 

+#endif // !wxUSE_STL