Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index ccb1e6397c7a2459925a34dfc94dce6432ebc8c9..eeab9cf2b00f5a8e1204fddcafdce96f5ffc3b86 100644 (file)
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -6,13 +6,20 @@
 // Created:     16/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#define _DEFINE_LIST(T, name)           \
-    void wx##name##Node::DeleteData()   \
-    {                                   \
-        delete (T *)GetData();          \
+#if wxUSE_STL
+
+#undef WX_DEFINE_LIST
+#define WX_DEFINE_LIST(name)
+
+#else // if !wxUSE_STL
+
+#define _DEFINE_LIST(T, name)                   \
+    void wx##name##Node::DeleteData()    \
+    {                                           \
+        delete (T *)GetData();                  \
     }
 
 // redefine the macro so that now it will generate the class implementation
@@ -22,3 +29,5 @@
 
 // don't pollute preprocessor's name space
 //#undef  _DEFINE_LIST
+
+#endif