X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a9fa36e4544fd9b7647d59c1108b49f368f243..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/txtstrm.h?ds=sidebyside diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index cadc66b798..9553ce1356 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -28,7 +28,7 @@ typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&); WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream ); -class WXDLLEXPORT wxTextInputStream +class WXDLLEXPORT wxTextInputStream { public: wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t") ); @@ -47,16 +47,16 @@ public: // Operators wxTextInputStream& operator>>(wxString& word); - wxTextInputStream& operator>>(wxChar& c); + wxTextInputStream& operator>>(char& c); wxTextInputStream& operator>>(wxInt16& i); wxTextInputStream& operator>>(wxInt32& i); wxTextInputStream& operator>>(wxUint16& i); wxTextInputStream& operator>>(wxUint32& i); wxTextInputStream& operator>>(double& i); wxTextInputStream& operator>>(float& f); - + wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); } - + protected: wxInputStream &m_input; wxString m_separators; @@ -70,10 +70,10 @@ typedef enum { wxEOL_NATIVE, wxEOL_UNIX, wxEOL_MAC, - wxEOL_DOS, + wxEOL_DOS } wxEOL; -class WXDLLEXPORT wxTextOutputStream +class WXDLLEXPORT wxTextOutputStream { public: wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE ); @@ -87,19 +87,19 @@ public: void Write8(wxUint8 i); virtual void WriteDouble(double d); virtual void WriteString(const wxString& string); - + wxTextOutputStream& operator<<(const wxChar *string); wxTextOutputStream& operator<<(const wxString& string); - wxTextOutputStream& operator<<(wxChar c); + wxTextOutputStream& operator<<(char c); wxTextOutputStream& operator<<(wxInt16 c); wxTextOutputStream& operator<<(wxInt32 c); wxTextOutputStream& operator<<(wxUint16 c); wxTextOutputStream& operator<<(wxUint32 c); wxTextOutputStream& operator<<(double f); wxTextOutputStream& operator<<(float f); - + wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); } - + protected: wxOutputStream &m_output; wxEOL m_mode;