X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cfcf22d47b7d9cf3c85edfe498c5f23a18a9a19..4f13428c4f852674c8f8fc99af26d9486bf907db:/src/common/list.cpp diff --git a/src/common/list.cpp b/src/common/list.cpp index 42368c0e51..3d8a0ef389 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Name: list.cpp +// Name: src/common/list.cpp // Purpose: wxList implementation // Author: Julian Smart // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added @@ -29,7 +29,6 @@ #include #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/list.h" #endif @@ -742,25 +741,26 @@ void wxStringList::Sort() wxNode *wxStringList::Add(const wxChar *s) { - return (wxNode *)wxStringListBase::Append(MYcopystring(s)); + return (wxNode *)(wxStringListBase::Node *) + wxStringListBase::Append(MYcopystring(s)); } wxNode *wxStringList::Prepend(const wxChar *s) { - return (wxNode *)wxStringListBase::Insert(MYcopystring(s)); + return (wxNode *)(wxStringListBase::Node *) + wxStringListBase::Insert(MYcopystring(s)); } #endif // wxLIST_COMPATIBILITY #else // wxUSE_STL = 1 - #include - WX_DEFINE_LIST(wxObjectList); + #include "wx/listimpl.cpp" + WX_DEFINE_LIST(wxObjectList) // with wxUSE_STL wxStringList contains wxString objects, not pointers -void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) ) +void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) ) { } #endif // !wxUSE_STL -