X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/555d0d7ef10ece4862658d47f076fb8631b1c7b6..855f31ebe72bef834a32df2c274b41fb282ad265:/include/wx/arrstr.h diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 18d7651c4f..95b3519e80 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -167,13 +167,6 @@ public: return Item(Count() - 1); } - // return a wxString[], useful for the controls which - // take one in their ctor. You must delete[] it yourself - // once you are done with it. Will return NULL if the - // ArrayString was empty. -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( wxString* GetStringArray() const ); -#endif // item management // Search the element in the array, starting from the beginning if @@ -191,9 +184,6 @@ public: // remove first item matching this value void Remove(const wxChar *sz); // remove item by index -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( void Remove(size_t nIndex, size_t nRemove = 1) ); -#endif void RemoveAt(size_t nIndex, size_t nRemove = 1); // sorting @@ -328,7 +318,7 @@ private: size_t m_nSize, // current size of the array m_nCount; // current number of elements - wxChar **m_pItems; // pointer to data + const wxChar **m_pItems; // pointer to data bool m_autoSort; // if true, keep the array always sorted };