X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb719f2e29bd20effa3259d2d7dead9fd857442c..3dece6c4bc6b3952cf2e3c77ca52081a443677be:/include/wx/txtstrm.h?ds=sidebyside diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 3a324b2f1f..6344c8ff62 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -12,10 +12,6 @@ #ifndef _WX_TXTSTREAM_H_ #define _WX_TXTSTREAM_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "txtstrm.h" -#endif - #include "wx/stream.h" #if wxUSE_STREAMS @@ -56,7 +52,7 @@ public: wxString ReadString(); // deprecated: use ReadLine or ReadWord instead wxString ReadLine(); wxString ReadWord(); - wxChar GetChar() { wxChar c = NextChar(); return c != wxEOT ? c : 0; } + wxChar GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); } wxString GetStringSeparators() const { return m_separators; } void SetStringSeparators(const wxString &c) { m_separators = c; } @@ -64,6 +60,9 @@ public: // Operators wxTextInputStream& operator>>(wxString& word); wxTextInputStream& operator>>(char& c); +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + wxTextInputStream& operator>>(wchar_t& wc); +#endif // wxUSE_UNICODE wxTextInputStream& operator>>(wxInt16& i); wxTextInputStream& operator>>(wxInt32& i); wxTextInputStream& operator>>(wxUint16& i); @@ -118,6 +117,8 @@ public: virtual void WriteDouble(double d); virtual void WriteString(const wxString& string); + wxTextOutputStream& PutChar(wxChar c); + wxTextOutputStream& operator<<(const wxChar *string); wxTextOutputStream& operator<<(const wxString& string); wxTextOutputStream& operator<<(char c);