X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ca1bf5add01419ba173f0567b060fdd9fd605f9..57e2b887a0e798ab5ab2921cdeba550f322b000c:/include/wx/txtstrm.h diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 8cbc1c747b..0bcf3e7d2c 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -1,22 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: txtstrm.h +// Name: wx/txtstrm.h // Purpose: Text stream classes // Author: Guilhem Lavaux // Modified by: // Created: 28/06/1998 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TXTSTREAM_H_ #define _WX_TXTSTREAM_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "txtstrm.h" -#endif - #include "wx/stream.h" +#include "wx/convauto.h" #if wxUSE_STREAMS @@ -32,7 +29,7 @@ WXDLLIMPEXP_BASE wxTextOutputStream &endl( wxTextOutputStream &stream ); #define wxEOT wxT('\4') // the End-Of-Text control code (used only inside wxTextInputStream) // If you're scanning through a file using wxTextInputStream, you should check for EOF _before_ -// reading the next item (word / number), because otherwise the last item may get lost. +// reading the next item (word / number), because otherwise the last item may get lost. // You should however be prepared to receive an empty item (empty string / zero number) at the // end of file, especially on Windows systems. This is unavoidable because most (but not all) files end // with whitespace (i.e. usually a newline). @@ -40,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(); @@ -53,10 +52,9 @@ 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 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 +62,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); @@ -73,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); @@ -103,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(); @@ -118,12 +125,13 @@ public: virtual void WriteDouble(double d); virtual void WriteString(const wxString& string); - wxTextOutputStream& operator<<(const wxChar *string); + wxTextOutputStream& PutChar(wxChar c); + wxTextOutputStream& operator<<(const wxString& string); wxTextOutputStream& operator<<(char c); -#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE wxTextOutputStream& operator<<(wchar_t wc); -#endif // wxUSE_WCHAR_T +#endif // wxUSE_UNICODE wxTextOutputStream& operator<<(wxInt16 c); wxTextOutputStream& operator<<(wxInt32 c); wxTextOutputStream& operator<<(wxUint16 c); @@ -136,9 +144,9 @@ public: protected: wxOutputStream &m_output; wxEOL m_mode; - + #if wxUSE_UNICODE - wxMBConv &m_conv; + wxMBConv *m_conv; #endif DECLARE_NO_COPY_CLASS(wxTextOutputStream)