Separate label with wx mnemonics (&) and with gtk mnemonics (_) into m_text and m_gtk...

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

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 11d0196a4e99f9cc09161b3f11f084a4143b76f7..1027f4eaabff7c1634f15b7eaffce20572a1fa09 100644 (file)
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -11,16 +11,17 @@
 
 #if wxUSE_STL
 
 
 #if wxUSE_STL
 

-    #undef  WX_DEFINE_LIST
-    #define WX_DEFINE_LIST(name)                                        \
-        void name::DeleteFunction( const _WX_LIST_ITEM_TYPE_##name X )  \
-        {                                                               \
-            delete X;                                                   \
-        }
-
-#else // if !wxUSE_STL
-
-    #define _DEFINE_LIST(T, name)         \
+#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 // !wxUSE_STL
+    #undef WX_DEFINE_LIST_2
+    #define WX_DEFINE_LIST_2(T, name)     \

         void wx##name##Node::DeleteData() \
         {                                 \
             delete (T *)GetData();        \
         void wx##name##Node::DeleteData() \
         {                                 \
             delete (T *)GetData();        \


@@ -29,10 +30,7 @@
     // 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
     // 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)
-
-    // don't pollute preprocessor's name space
-    //#undef  _DEFINE_LIST
+    #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)

 
 

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