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