X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ec698211d5d82a009ac80fb354059e9af497508..38a5c64e29ab1d081af309a73c7af94069cf799f:/src/common/list.cpp diff --git a/src/common/list.cpp b/src/common/list.cpp index 398627b6c0..3d8a0ef389 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -29,7 +29,6 @@ #include #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/list.h" #endif @@ -742,12 +741,14 @@ 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 @@ -755,10 +756,10 @@ wxNode *wxStringList::Prepend(const wxChar *s) #else // wxUSE_STL = 1 #include "wx/listimpl.cpp" - WX_DEFINE_LIST(wxObjectList); + 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) ) { }