X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..4264606eedb18f626e864020082d8dde8d055eea:/include/wx/listimpl.cpp?ds=sidebyside

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 1f1dba3a81..1027f4eaab 100644
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -11,23 +11,26 @@
 
 #if wxUSE_STL
 
-#undef WX_DEFINE_LIST
-#define WX_DEFINE_LIST(name)
-
-#else // if !wxUSE_STL
+#undef  WX_DEFINE_LIST
+#define WX_DEFINE_LIST(name)                                                  \
+    void _WX_LIST_HELPER_##name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X )\
+    {                                                                         \
+        delete X;                                                             \
+    }                                                                         \
+    name::BaseListType name::EmptyList;
 
-#define _DEFINE_LIST(T, name)                   \
-    void wx##name##Node::DeleteData()    \
-    {                                           \
-        delete (T *)GetData();                  \
-    }
+#else // !wxUSE_STL
+    #undef WX_DEFINE_LIST_2
+    #define WX_DEFINE_LIST_2(T, name)     \
+        void wx##name##Node::DeleteData() \
+        {                                 \
+            delete (T *)GetData();        \
+        }
 
-// redefine the macro so that now it will generate the class implementation
-// old value would provoke a compile-time error if this file is not included
-#undef  WX_DEFINE_LIST
-#define WX_DEFINE_LIST(name) _DEFINE_LIST(_WX_LIST_ITEM_TYPE_##name, name)
+    // redefine the macro so that now it will generate the class implementation
+    // old value would provoke a compile-time error if this file is not included
+    #undef  WX_DEFINE_LIST
+    #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)
 
-// don't pollute preprocessor's name space
-//#undef  _DEFINE_LIST
+#endif // wxUSE_STL/!wxUSE_STL
 
-#endif