wxDataObejct and related changes (won't compile right now)

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 49e32680592641e58b1f0a6efa94c75f1d4104cd..e442699d80a9aa72a8f123e88dbf2d1aec8889f4 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -37,13 +37,6 @@
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 

-// -----------------------------------------------------------------------------
-// implementation of standard lists
-// -----------------------------------------------------------------------------
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxWindowList);
-

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


@@ -59,7 +52,7 @@ bool wxListKey::operator==(wxListKeyValue value) const
     switch ( m_keyType )
     {
         default:
     switch ( m_keyType )
     {
         default:

-            wxFAIL_MSG(_T("bad key type."));
+            wxFAIL_MSG(wxT("bad key type."));

             // let compiler optimize the line above away in release build
             // by not putting return here...
 
             // let compiler optimize the line above away in release build
             // by not putting return here...
 


@@ -99,7 +92,7 @@ wxNodeBase::wxNodeBase(wxListBase *list,
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("invalid key type"));
+            wxFAIL_MSG(wxT("invalid key type"));

     }
 
     if ( previous )
     }
 
     if ( previous )


@@ -127,7 +120,7 @@ wxNodeBase::~wxNodeBase()
 
 int wxNodeBase::IndexOf() const
 {
 
 int wxNodeBase::IndexOf() const
 {

-    wxCHECK_MSG( m_list, wxNOT_FOUND, _T("node doesn't belong to a list in IndexOf"));
+    wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf"));

 
     // It would be more efficient to implement IndexOf() completely inside
     // wxListBase (only traverse the list once), but this is probably a more
 
     // It would be more efficient to implement IndexOf() completely inside
     // wxListBase (only traverse the list once), but this is probably a more


@@ -170,7 +163,7 @@ wxListBase::wxListBase(size_t count, void *elements[])
 void wxListBase::DoCopy(const wxListBase& list)
 {
     wxASSERT_MSG( !list.m_destroy,
 void wxListBase::DoCopy(const wxListBase& list)
 {
     wxASSERT_MSG( !list.m_destroy,

-                  _T("copying list which owns it's elements is a bad idea") );
+                  wxT("copying list which owns it's elements is a bad idea") );

 
     m_count = list.m_count;
     m_destroy = list.m_destroy;
 
     m_count = list.m_count;
     m_destroy = list.m_destroy;


@@ -217,7 +210,7 @@ wxNodeBase *wxListBase::Append(void *object)
 {
     // all objects in a keyed list should have a key
     wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
 {
     // all objects in a keyed list should have a key
     wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,

-                 _T("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);
 
 
     wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object);
 


@@ -229,7 +222,7 @@ wxNodeBase *wxListBase::Append(long key, void *object)
     wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
                  (wxNodeBase *)NULL,
     wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
                  (wxNodeBase *)NULL,

-                 _T("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);
     return AppendCommon(node);
 
     wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
     return AppendCommon(node);


@@ -240,7 +233,7 @@ wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
     wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
                  (wxNodeBase *)NULL,
     wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
                  (wxNodeBase *)NULL,

-                 _T("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);
     return AppendCommon(node);
 
     wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
     return AppendCommon(node);


@@ -250,10 +243,10 @@ 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,
 {
     // all objects in a keyed list should have a key
     wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,

-                 _T("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, (wxNodeBase *)NULL,

-                 _T("can't insert before a node from another list") );
+                 wxT("can't insert before a node from another list") );

 
     // previous and next node for the node being inserted
     wxNodeBase *prev, *next;
 
     // previous and next node for the node being inserted
     wxNodeBase *prev, *next;


@@ -295,7 +288,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
         }
     }
 
         }
     }
 

-    wxFAIL_MSG( _T("invalid index in wxListBase::Item") );
+    wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );

 
     return (wxNodeBase *)NULL;
 }
 
     return (wxNodeBase *)NULL;
 }


@@ -303,7 +296,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
 wxNodeBase *wxListBase::Find(const wxListKey& key) const
 {
     wxASSERT_MSG( m_keyType == key.GetKeyType(),
 wxNodeBase *wxListBase::Find(const wxListKey& key) const
 {
     wxASSERT_MSG( m_keyType == key.GetKeyType(),

-                  _T("this list is not keyed on the type of this key") );
+                  wxT("this list is not keyed on the type of this key") );

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


@@ -356,9 +349,9 @@ void wxListBase::DoDeleteNode(wxNodeBase *node)
 
 wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
 {
 
 wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
 {

-    wxCHECK_MSG( node, NULL, _T("detaching NULL wxNodeBase") );
+    wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") );

     wxCHECK_MSG( node->m_list == this, NULL,
     wxCHECK_MSG( node->m_list == this, NULL,

-                 _T("detaching node which is not from this list") );
+                 wxT("detaching node which is not from this list") );

 
     // update the list
     wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
 
     // update the list
     wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next


@@ -570,7 +563,7 @@ wxStringList::wxStringList (const wxChar *first, ...)
       s = va_arg(ap, const wxChar *);
       //    if (s == NULL)
 #ifdef __WXMSW__
       s = va_arg(ap, const wxChar *);
       //    if (s == NULL)
 #ifdef __WXMSW__

-      if ((int) s == 0)
+      if ((int)(long) s == 0)

 #else
       if ((long) s == 0)
 #endif
 #else
       if ((long) s == 0)
 #endif


@@ -611,7 +604,7 @@ bool wxStringList::Member(const wxChar *s) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-static int
+static int LINKAGEMODE

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