Unicode definitions for glibc, etc.

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

diff --git a/include/wx/list.h b/include/wx/list.h
index aa901935409924e497561c3c61bd85792bbacf38..8bd77c2d2f3f8b4864cdc0bf98d69633812e476c 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:       wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -165,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() { }
@@ -197,17 +197,17 @@ public:
     size_t GetCount() const { return m_count; }
 
     // operations
-    
+
         // delete all nodes
     void Clear();
-    
+
         // instruct it to destroy user data when deleting nodes
     void DeleteContents(bool destroy) { m_destroy = destroy; }
 
        // query if to delete
     bool GetDeleteContents() const
         { return m_destroy; }
-    
+
       // get the keytype
     wxKeyType GetKeyType() const
         { return m_keyType; }
@@ -216,7 +216,15 @@ public:
     void SetKeyType(wxKeyType keyType)
         { wxASSERT( m_count==0 ); m_keyType = keyType; }
 
+#ifdef wxLIST_COMPATIBILITY
+    int Number() const { return GetCount(); }
+    wxNode *First() const { return (wxNode *)GetFirst(); }
+    wxNode *Last() const { return (wxNode *)GetLast(); }
+    wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
+#endif // wxLIST_COMPATIBILITY
+
 protected:
+
     // all methods here are "overloaded" in derived classes to provide compile
     // time type checking
 
@@ -225,12 +233,18 @@ protected:
                                    void *data,
                                    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
     wxListBase(size_t count, void *elements[]);
         // from a sequence of objects
     wxListBase(void *object, ... /* terminate with NULL */);
 
+protected:
         // copy ctor and assignment operator
     wxListBase(const wxListBase& list)
         { DoCopy(list); }
@@ -276,7 +290,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
@@ -287,7 +301,7 @@ protected:
     void *FirstThat(wxListIterateFunction func);
     void ForEach(wxListIterateFunction func);
     void *LastThat(wxListIterateFunction func);
-    
+
 private:
     // helpers
         // common part of all ctors
@@ -315,15 +329,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)                                \
@@ -336,7 +350,7 @@ private:
                  nodetype *previous = (nodetype *)NULL,                     \
                  nodetype *next = (nodetype *)NULL,                         \
                  T *data = (T *)NULL,                                       \
-                 const wxListKey& key = wxDefaultListKey)                        \
+                 const wxListKey& key = wxDefaultListKey)                   \
             : wxNodeBase(list, previous, next, data, key) { }               \
                                                                             \
         nodetype *GetNext() const                                           \
@@ -352,7 +366,7 @@ private:
         virtual void DeleteData();                                          \
     };                                                                      \
                                                                             \
-    class WXDLLEXPORT name : public wxListBase                                          \
+    class WXDLLEXPORT name : public wxListBase                              \
     {                                                                       \
     public:                                                                 \
         typedef nodetype Node;                                              \
@@ -410,7 +424,7 @@ private:
     protected:                                                              \
         wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,          \
                                void *data,                                  \
-                               const wxListKey& key = wxDefaultListKey)          \
+                               const wxListKey& key = wxDefaultListKey)     \
             {                                                               \
                 return new nodetype(this,                                   \
                                     (nodetype *)prev, (nodetype *)next,     \
@@ -426,11 +440,17 @@ private:
 //      #include <wx/listimpl.cpp>
 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
-
 // =============================================================================
 // now we can define classes 100% compatible with the old ones
 // =============================================================================
 
+// ----------------------------------------------------------------------------
+// commonly used string classes
+// ----------------------------------------------------------------------------
+
+class wxWindow;
+WX_DECLARE_LIST(wxWindow, wxWindowList);
+
 #ifdef wxLIST_COMPATIBILITY
 
 // -----------------------------------------------------------------------------
@@ -447,10 +467,6 @@ public:
     // compatibility methods
     void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
 
-    int Number() const { return GetCount(); }
-    wxNode *First() const { return (wxNode *)GetFirst(); }
-    wxNode *Last() const { return (wxNode *)GetLast(); }
-    wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
     wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
 };
 
@@ -487,12 +503,6 @@ public:
     // alphabetic sort
     void Sort();
 
-    // compatibility methods
-    int Number() const { return GetCount(); }
-    wxNode *First() const { return (wxNode *)GetFirst(); }
-    wxNode *Last() const { return (wxNode *)GetLast(); }
-    wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
-
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=
 };