X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d36c9347ea16171bc2f855076d8b9b11801ec622..51f5e2822cdcb8b433b1d117f186dfd8bb06e240:/include/wx/txtstrm.h diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index b5d94c749f..248af2453a 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: txtstrm.h +// Name: wx/txtstrm.h // Purpose: Text stream classes // Author: Guilhem Lavaux // Modified by: @@ -52,7 +52,6 @@ public: wxInt16 Read16S(int base = 10); wxInt8 Read8S(int base = 10); double ReadDouble(); - wxString ReadString(); // deprecated: use ReadLine or ReadWord instead wxString ReadLine(); wxString ReadWord(); wxChar GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); } @@ -75,6 +74,10 @@ public: wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); } +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( wxString ReadString() ); // use ReadLine or ReadWord instead +#endif // WXWIN_COMPATIBILITY_2_6 + protected: wxInputStream &m_input; wxString m_separators;