X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/375894195f3a1fb92fbde0aed2a92bfec1258d09..421a84317fc3d53ac4fd64613f1af2d19018efc5:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index 8e1d5169eb..ffddd09a58 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -42,9 +42,6 @@ #include "wx/beforestd.h" #include #include "wx/afterstd.h" - #if defined(__WXMSW__) && defined(__MINGW32__) - #include "wx/msw/winundef.h" - #endif #endif // ---------------------------------------------------------------------------- @@ -54,6 +51,7 @@ // type of compare function for list sort operation (as in 'qsort'): it should // return a negative value, 0 or positive value if the first element is less // than, equal or greater than the second + extern "C" { typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); @@ -1052,6 +1050,20 @@ WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLEXPORT); class WXDLLEXPORT wxStringList : public wxStringListBase { public: + compatibility_iterator Append(wxChar* s) + { wxString tmp = s; delete[] s; return wxStringListBase::Append(tmp); } + compatibility_iterator Insert(wxChar* s) + { wxString tmp = s; delete[] s; return wxStringListBase::Insert(tmp); } + compatibility_iterator Insert(size_t pos, wxChar* s) + { + wxString tmp = s; + delete[] s; + return wxStringListBase::Insert(pos, tmp); + } + compatibility_iterator Add(const wxChar* s) + { push_back(s); return GetLast(); } + compatibility_iterator Prepend(const wxChar* s) + { push_front(s); return GetFirst(); } }; #endif // wxUSE_STL