char handling fixed again

[wxWidgets.git] / include / wx / list.h

diff --git a/include/wx/list.h b/include/wx/list.h
index a65bb8d4856224fa2764a264521d1648303fdc71..b5789828662db1b3244ad35185aa4cd2e8b574fa 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -127,6 +127,8 @@ private:
 // wxNodeBase class is a (base for) node in a double linked list
 // -----------------------------------------------------------------------------
 
+WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
+
 class WXDLLEXPORT wxNodeBase
 {
 friend class wxListBase;
@@ -136,7 +138,7 @@ public:
                wxNodeBase *previous = (wxNodeBase *)NULL,
                wxNodeBase *next = (wxNodeBase *)NULL,
                void *data = NULL,
-               const wxListKey& key = wxListKey());
+               const wxListKey& key = wxDefaultListKey);
 
     virtual ~wxNodeBase();
 
@@ -163,7 +165,7 @@ protected:
     void *GetData() const { return m_data; }
     void SetData(void *data) { m_data = data; }
 
-    // get 0-based index of this node within the list or NOT_FOUND
+    // get 0-based index of this node within the list or wxNOT_FOUND
     int IndexOf() const;
 
     virtual void DeleteData() { }
@@ -215,13 +217,19 @@ public:
         { wxASSERT( m_count==0 ); m_keyType = keyType; }
 
 protected:
+
     // all methods here are "overloaded" in derived classes to provide compile
     // time type checking
 
     // create a node for the list of this type
     virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,
                                    void *data,
-                                   const wxListKey& key = wxListKey()) = 0;
+                                   const wxListKey& key = wxDefaultListKey) = 0;
+
+// Can't access these from derived classes otherwise (bug in Salford C++?)
+#ifdef __SALFORDC__
+public:
+#endif
 
     // ctors
         // from an array
@@ -229,6 +237,7 @@ protected:
         // from a sequence of objects
     wxListBase(void *object, ... /* terminate with NULL */);
 
+protected:
         // copy ctor and assignment operator
     wxListBase(const wxListBase& list)
         { DoCopy(list); }
@@ -274,7 +283,7 @@ protected:
         // by key
     wxNodeBase *Find(const wxListKey& key) const;
 
-    // get 0-based index of object or NOT_FOUND
+    // get 0-based index of object or wxNOT_FOUND
     int IndexOf( void *object ) const;
 
     // this function allows the sorting of arbitrary lists by giving
@@ -289,7 +298,7 @@ protected:
 private:
     // helpers
         // common part of all ctors
-    void Init(wxKeyType keyType);
+    void Init(wxKeyType keyType = wxKEY_NONE);
         // common part of copy ctor and assignment operator
     void DoCopy(const wxListBase& list);
         // common part of all Append()s
@@ -313,15 +322,15 @@ private:
 
 // declare a list type named 'name' and containing elements of type 'T *'
 // (as a by product of macro expansion you also get wx##name##Node
-// wxNode-dervied type)
+// wxNode-derived type)
 //
 // implementation details:
-//  1. we define _WX_LIST_ITEM_TYPE_##name typedef to save in it the item type
+//  1. We define _WX_LIST_ITEM_TYPE_##name typedef to save in it the item type
 //     for the list of given type - this allows us to pass only the list name
 //     to WX_DEFINE_LIST() even if it needs both the name and the type
 //
-//  2. We redefine all not type-safe wxList functions withtype-safe versions
-//     which don't take any place (everything is inline), but bring compile
+//  2. We redefine all non-type-safe wxList functions with type-safe versions
+//     which don't take any space (everything is inline), but bring compile
 //     time error checking.
 
 #define WX_DECLARE_LIST_2(T, name, nodetype)                                \
@@ -334,7 +343,7 @@ private:
                  nodetype *previous = (nodetype *)NULL,                     \
                  nodetype *next = (nodetype *)NULL,                         \
                  T *data = (T *)NULL,                                       \
-                 const wxListKey& key = wxListKey())                        \
+                 const wxListKey& key = wxDefaultListKey)                        \
             : wxNodeBase(list, previous, next, data, key) { }               \
                                                                             \
         nodetype *GetNext() const                                           \
@@ -353,6 +362,8 @@ private:
     class WXDLLEXPORT name : public wxListBase                                          \
     {                                                                       \
     public:                                                                 \
+        typedef nodetype Node;                                              \
+                                                                            \
         name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType)          \
             { }                                                             \
         name(size_t count, T *elements[])                                   \
@@ -406,7 +417,7 @@ private:
     protected:                                                              \
         wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,          \
                                void *data,                                  \
-                               const wxListKey& key = wxListKey())          \
+                               const wxListKey& key = wxDefaultListKey)          \
             {                                                               \
                 return new nodetype(this,                                   \
                                     (nodetype *)prev, (nodetype *)next,     \
@@ -475,8 +486,7 @@ public:
     wxNode *Add(const char *s)
         { return (wxNode *)wxStringListBase::Append(copystring(s)); }
 
-    void Delete(const char *s)
-        { wxStringListBase::DeleteObject((char *)s); }
+    bool Delete(const char *s);
 
     char **ListToArray(bool new_copies = FALSE) const;
     bool Member(const char *s) const;