Make wxChoice and wxComboBox behaviour same as in native controls in wxMSW.

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

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 1f1dba3a81278908640920af926c29ca53fee67b..d9a4ffadf273d78259f76152648fdc64458a74b4 100644 (file)
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listimpl.cpp
+// Name:        wx/listimpl.cpp
 // Purpose:     second-part of macro based implementation of template lists
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -9,25 +9,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
 
-#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;                                                             \
+    }                                                                         \
+    _WX_LIST_HELPER_##name::BaseListType _WX_LIST_HELPER_##name::EmptyList;
 
-#define _DEFINE_LIST(T, name)                   \
-    void wx##name##Node::DeleteData()    \
-    {                                           \
-        delete (T *)GetData();                  \
-    }
+#else // !wxUSE_STD_CONTAINERS
+    #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_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
 
-#endif