minor changes as per RN comments - add some comments and reorder a switch stmt.

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

diff --git a/include/wx/list.h b/include/wx/list.h
index fb597e90aad579fea0852d98b53d1dea290d937f..a83cff416650e4c95b7b71930516dd9b6690a8a0 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -135,6 +135,13 @@ private:
 
 #endif // defined( __VISUALC__ )
 
 
 #endif // defined( __VISUALC__ )
 

+// Visual C++ 2005 complains about the const
+#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || defined(__MWERKS__)
+#define _WX_DELETEFUNCTIONCONST
+#else
+#define _WX_DELETEFUNCTIONCONST const
+#endif
+

 #define WX_DECLARE_LIST_XO(elT, liT, decl)                                    \
     VC6_WORKAROUND(elT, liT, decl)                                            \
     decl liT : public std::list<elT>                                          \
 #define WX_DECLARE_LIST_XO(elT, liT, decl)                                    \
     VC6_WORKAROUND(elT, liT, decl)                                            \
     decl liT : public std::list<elT>                                          \


@@ -143,7 +150,7 @@ private:
         bool m_destroy;                                                       \
     private:                                                                  \
         typedef elT _WX_LIST_ITEM_TYPE_##liT;                                 \
         bool m_destroy;                                                       \
     private:                                                                  \
         typedef elT _WX_LIST_ITEM_TYPE_##liT;                                 \

-        static void DeleteFunction( const _WX_LIST_ITEM_TYPE_##liT X );       \
+        static void DeleteFunction( _WX_DELETEFUNCTIONCONST _WX_LIST_ITEM_TYPE_##liT X );       \

     public:                                                                   \
         class compatibility_iterator                                          \
         {                                                                     \
     public:                                                                   \
         class compatibility_iterator                                          \
         {                                                                     \