X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/txtstrm.h diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 6344c8ff62..0c3983799c 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: @@ -13,11 +13,12 @@ #define _WX_TXTSTREAM_H_ #include "wx/stream.h" +#include "wx/convauto.h" #if wxUSE_STREAMS -class WXDLLIMPEXP_BASE wxTextInputStream; -class WXDLLIMPEXP_BASE wxTextOutputStream; +class WXDLLIMPEXP_FWD_BASE wxTextInputStream; +class WXDLLIMPEXP_FWD_BASE wxTextOutputStream; typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&); typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&); @@ -36,9 +37,11 @@ class WXDLLIMPEXP_BASE wxTextInputStream { public: #if wxUSE_UNICODE - wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t"), wxMBConv& conv = wxConvUTF8 ); + wxTextInputStream(wxInputStream& s, + const wxString &sep=wxT(" \t"), + const wxMBConv& conv = wxConvAuto()); #else - wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t") ); + wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t")); #endif ~wxTextInputStream(); @@ -49,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); } @@ -72,13 +74,17 @@ 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; char m_lastBytes[10]; // stores the bytes that were read for the last character #if wxUSE_UNICODE - wxMBConv &m_conv; + wxMBConv *m_conv; #endif bool EatEOL(const wxChar &c); @@ -102,9 +108,11 @@ class WXDLLIMPEXP_BASE wxTextOutputStream { public: #if wxUSE_UNICODE - wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE, wxMBConv& conv = wxConvUTF8 ); + wxTextOutputStream(wxOutputStream& s, + wxEOL mode = wxEOL_NATIVE, + const wxMBConv& conv = wxConvAuto()); #else - wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE ); + wxTextOutputStream(wxOutputStream& s, wxEOL mode = wxEOL_NATIVE); #endif virtual ~wxTextOutputStream(); @@ -119,7 +127,8 @@ public: wxTextOutputStream& PutChar(wxChar c); - wxTextOutputStream& operator<<(const wxChar *string); + void Flush(); + wxTextOutputStream& operator<<(const wxString& string); wxTextOutputStream& operator<<(char c); #if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE @@ -139,7 +148,7 @@ protected: wxEOL m_mode; #if wxUSE_UNICODE - wxMBConv &m_conv; + wxMBConv *m_conv; #endif DECLARE_NO_COPY_CLASS(wxTextOutputStream)