Removed the new flicker code.

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 96fe849a3d43007d8cc0014760562e7698048d4d..625387f67ea3057df787d3e717c16159dd839bcb 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -40,7 +40,7 @@
 
 // due to circular header dependencies this function has to be declared here
 // (normally it's found in utils.h which includes itself list.h...)
-extern char* WXDLLEXPORT copystring(const char *s);
+extern WXDLLEXPORT char* copystring(const char *s);
 
 class WXDLLEXPORT wxObjectListNode;
 typedef wxObjectListNode wxNode;
@@ -106,23 +106,10 @@ public:
     long GetNumber() const
         { wxASSERT( m_keyType == wxKEY_INTEGER ); return m_key.integer; }
 
-    // comparaison
-    bool operator==(wxListKeyValue value) const
-    {
-        switch ( m_keyType )
-        {
-            default:
-                wxFAIL_MSG("bad key type.");
-                // let compiler optimize the line above away in release build
-                // by not putting return here...
-
-            case wxKEY_STRING:
-                return strcmp(m_key.string, value.string) == 0;
-
-            case wxKEY_INTEGER:
-                return m_key.integer == value.integer;
-        }
-    }
+    // comparison
+    // Note: implementation moved to list.cpp to prevent BC++ inline
+    // expansion warning.
+    bool operator==(wxListKeyValue value) const ;
 
     // dtor
     ~wxListKey()
@@ -155,6 +142,11 @@ public:
 
     // @@ no check is done that the list is really keyed on strings
     const char *GetKeyString() const { return m_key.string; }
+    long GetKeyInteger() const { return m_key.integer; }
+
+    // Necessary for some existing code
+    void SetKeyString(char* s) { m_key.string = s; }
+    void SetKeyInteger(long i) { m_key.integer = i; }
 
 #ifdef wxLIST_COMPATIBILITY
     // compatibility methods
@@ -201,7 +193,7 @@ public:
 
     // operations
         // delete all nodes
-    virtual void Clear();
+    void Clear();
         // instruct it to destroy user data when deleting nodes
     void DeleteContents(bool destroy) { m_destroy = destroy; }
 
@@ -235,13 +227,13 @@ protected:
 
         // get the list item's data
     void *operator[](size_t index) const
-        { wxNodeBase *node = Item(index); return node ? node->GetData() : NULL; }
+        { wxNodeBase *node = Item(index); return node ? node->GetData() : (wxNodeBase*)NULL; }
 
     // operations
         // append to end of list
     wxNodeBase *Append(void *object);
         // insert a new item at the beginning of the list
-    wxNodeBase *Insert(void *object) { return Insert(NULL, object); }
+    wxNodeBase *Insert(void *object) { return Insert( (wxNodeBase*)NULL, object); }
         // insert before given node or at front of list if prev == NULL
     wxNodeBase *Insert(wxNodeBase *prev, void *object);
 
@@ -267,7 +259,7 @@ protected:
 
     // this function allows the sorting of arbitrary lists by giving
     // a function to compare two list elements. The list is sorted in place.
-    void Sort(wxSortCompareFunction compfunc);
+    void Sort(const wxSortCompareFunction compfunc);
 
     // functions for iterating over the list
     void *FirstThat(wxListIterateFunction func);
@@ -338,7 +330,7 @@ private:
         virtual void DeleteData();                                          \
     };                                                                      \
                                                                             \
-    class name : public wxListBase                                          \
+    class WXDLLEXPORT name : public wxListBase                                          \
     {                                                                       \
     public:                                                                 \
         name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType)          \
@@ -363,7 +355,7 @@ private:
         nodetype *Append(T *object)                                         \
             { return (nodetype *)wxListBase::Append(object); }              \
         nodetype *Insert(T *object)                                         \
-            { return (nodetype *)Insert(NULL, object); }                    \
+            { return (nodetype *)Insert((nodetype*)NULL, object); }         \
         nodetype *Insert(nodetype *prev, T *object)                         \
             { return (nodetype *)wxListBase::Insert(prev, object); }        \
                                                                             \
@@ -449,6 +441,12 @@ public:
     wxStringList() { DeleteContents(TRUE); }
     wxStringList(const char *first ...);
 
+        // copying the string list: the strings are copied, too (extremely
+        // inefficient!)
+    wxStringList(const wxStringList& other) { DoCopy(other); }
+    wxStringList& operator=(const wxStringList& other)
+        { Clear(); DoCopy(other); return *this; }
+
     // operations
         // makes a copy of the string
     wxNode *Add(const char *s)
@@ -468,6 +466,9 @@ public:
     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=
 };
 
 #endif // wxLIST_COMPATIBILITY