Resize fine tuning

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 6c9a9a3af5631a3f27da3ac08cbc77a8c5d38fd3..dc52fc248cb53c7b98901a204082cf1298b792f5 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -36,10 +36,11 @@
 #include "wx/defs.h"
 #include "wx/debug.h"
 #include "wx/object.h"
+#include "wx/string.h"
 
 // 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;
@@ -105,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()
@@ -266,7 +254,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);
@@ -320,7 +308,7 @@ private:
         nodetype(wxListBase *list = (wxListBase *)NULL,                     \
                  nodetype *previous = (nodetype *)NULL,                     \
                  nodetype *next = (nodetype *)NULL,                         \
-                 T *data = NULL,                                            \
+                 T *data = (T *)NULL,                                       \
                  const wxListKey& key = wxListKey())                        \
             : wxNodeBase(list, previous, next, data, key) { }               \
                                                                             \
@@ -337,7 +325,7 @@ private:
         virtual void DeleteData();                                          \
     };                                                                      \
                                                                             \
-    class name : public wxListBase                                          \
+    class WXDLLEXPORT name : public wxListBase                                          \
     {                                                                       \
     public:                                                                 \
         name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType)          \
@@ -356,7 +344,7 @@ private:
         T *operator[](size_t index) const                                   \
         {                                                                   \
             nodetype *node = Item(index);                                   \
-            return node ? node->GetData() : NULL;                           \
+            return node ? (T*)(node->GetData()) : (T*)NULL;                 \
         }                                                                   \
                                                                             \
         nodetype *Append(T *object)                                         \
@@ -425,6 +413,8 @@ public:
     wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }
 
     // 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(); }