X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ff126ac4ff57ab4aa22a5c7c7ce621479e8739..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/txtstrm.h?ds=sidebyside diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 248af2453a..e40d67de5f 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -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); @@ -93,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 @@ -116,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; } @@ -127,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 @@ -150,7 +155,7 @@ protected: wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxTextOutputStream) + wxDECLARE_NO_COPY_CLASS(wxTextOutputStream); }; #endif