made all XPM const to avoid warnings from mingw32 4.0 and adopt the code accordingly...

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 3d8a0ef389f96c8012ba9cab7ae39f1ee5a9eeac..15535b3552a7a47a698b796124b5bc47b18a30d5 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -30,6 +30,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"

+    #include "wx/crt.h"

 #endif
 
 #if !wxUSE_STL
 #endif
 
 #if !wxUSE_STL


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


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


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


@@ -257,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),


@@ -573,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 )
 {


@@ -595,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()


@@ -763,4 +760,6 @@ void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
 {
 }
 
 {
 }
 

+wxStringListBase::BaseListType wxStringListBase::EmptyList;
+

 #endif // !wxUSE_STL
 #endif // !wxUSE_STL