X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/830f8f11bca5c0892ae767ba14790c8b5b59011f..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/txtstrm.h diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index d8011a8e49..e40d67de5f 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: @@ -17,8 +17,8 @@ #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&); @@ -45,6 +45,8 @@ public: #endif ~wxTextInputStream(); + const wxInputStream& GetInputStream() const { return m_input; } + wxUint32 Read32(int base = 10); // base may be between 2 and 36, inclusive, or the special 0 (= C format) wxUint16 Read16(int base = 10); wxUint8 Read8(int base = 10); @@ -52,7 +54,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,13 +76,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); @@ -90,7 +95,7 @@ protected: wxChar NextChar(); // this should be used instead of GetC() because of Unicode issues wxChar NextNonSeparators(); - DECLARE_NO_COPY_CLASS(wxTextInputStream) + wxDECLARE_NO_COPY_CLASS(wxTextInputStream); }; typedef enum @@ -113,6 +118,8 @@ public: #endif virtual ~wxTextOutputStream(); + const wxOutputStream& GetOutputStream() const { return m_output; } + void SetMode( wxEOL mode = wxEOL_NATIVE ); wxEOL GetMode() { return m_mode; } @@ -124,7 +131,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 @@ -144,10 +152,10 @@ protected: wxEOL m_mode; #if wxUSE_UNICODE - wxMBConv m_conv; + wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxTextOutputStream) + wxDECLARE_NO_COPY_CLASS(wxTextOutputStream); }; #endif