Apply patch [ 1548750 ] wxVsnprintf() various fixes

[wxWidgets.git] / include / wx / listimpl.cpp

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index a7d3729d087df341504e8611a647a43ccea48176..c4c8e020d06e83b3ae6c4f53aff5c246b36ad015 100644 (file)
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -11,14 +11,15 @@
 
 #if wxUSE_STL
 
 
 #if wxUSE_STL
 

-    #undef  WX_DEFINE_LIST
-    #define WX_DEFINE_LIST(name)                                        \
-        void name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X )        \
-        {                                                               \
-            delete X;                                                   \
-        }
+#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;

 
 

-#else // if !wxUSE_STL
+#else // !wxUSE_STL

 
     #define _DEFINE_LIST(T, name)         \
         void wx##name##Node::DeleteData() \
 
     #define _DEFINE_LIST(T, name)         \
         void wx##name##Node::DeleteData() \


@@ -34,5 +35,5 @@
     // don't pollute preprocessor's name space
     //#undef  _DEFINE_LIST
 
     // don't pollute preprocessor's name space
     //#undef  _DEFINE_LIST
 

-#endif
+#endif // wxUSE_STL/!wxUSE_STL