X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcaa23de098c1276b3f35716c9ea8b73cf3599bd..0cdd4e199e078e34076b7f28ea65be81ffb7960c:/include/wx/listimpl.cpp diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp index d7ef44dded..11d0196a4e 100644 --- a/include/wx/listimpl.cpp +++ b/include/wx/listimpl.cpp @@ -6,19 +6,33 @@ // Created: 16/11/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#define _DEFINE_LIST(T, name) \ - void wx##name##Node::DeleteData() \ - { \ - delete (T *)GetData(); \ - } +#if wxUSE_STL -// 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) + #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) \ + 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) + + // don't pollute preprocessor's name space + //#undef _DEFINE_LIST + +#endif -// don't pollute preprocessor's name space -//#undef _DEFINE_LIST