X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/txtstrm.h diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 145257697e..d9d3399415 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -1,51 +1,60 @@ ///////////////////////////////////////////////////////////////////////////// -// 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(__APPLE__) -#pragma interface "txtstrm.h" -#endif - #include "wx/stream.h" +#include "wx/convauto.h" #if wxUSE_STREAMS -class WXDLLEXPORT wxTextInputStream; -class WXDLLEXPORT wxTextOutputStream; +class WXDLLIMPEXP_FWD_BASE wxTextInputStream; +class WXDLLIMPEXP_FWD_BASE wxTextOutputStream; typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&); typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&); -WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream ); +WXDLLIMPEXP_BASE wxTextOutputStream &endl( wxTextOutputStream &stream ); + +#define wxEOT wxT('\4') // the End-Of-Text control code (used only inside wxTextInputStream) -class WXDLLEXPORT 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. +// 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). +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(); - wxUint32 Read32(); - wxUint16 Read16(); - wxUint8 Read8(); + 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); + wxInt32 Read32S(int base = 10); + 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); } wxString GetStringSeparators() const { return m_separators; } void SetStringSeparators(const wxString &c) { m_separators = c; } @@ -53,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); @@ -62,17 +74,26 @@ 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); + void UngetLast(); // should be used instead of wxInputStream::Ungetch() because of Unicode issues + // returns EOT (\4) if there is a stream error, or end of file + wxChar NextChar(); // this should be used instead of GetC() because of Unicode issues wxChar NextNonSeparators(); - void SkipIfEndOfLine( wxChar c ); + + wxDECLARE_NO_COPY_CLASS(wxTextInputStream); }; typedef enum @@ -83,13 +104,15 @@ typedef enum wxEOL_DOS } wxEOL; -class WXDLLEXPORT wxTextOutputStream +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(); @@ -102,9 +125,15 @@ public: virtual void WriteDouble(double d); virtual void WriteString(const wxString& string); - wxTextOutputStream& operator<<(const wxChar *string); + wxTextOutputStream& PutChar(wxChar c); + + void Flush(); + wxTextOutputStream& operator<<(const wxString& string); wxTextOutputStream& operator<<(char c); +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + wxTextOutputStream& operator<<(wchar_t wc); +#endif // wxUSE_UNICODE wxTextOutputStream& operator<<(wxInt16 c); wxTextOutputStream& operator<<(wxInt32 c); wxTextOutputStream& operator<<(wxUint16 c); @@ -117,11 +146,12 @@ public: protected: wxOutputStream &m_output; wxEOL m_mode; - + #if wxUSE_UNICODE - wxMBConv &m_conv; + wxMBConv *m_conv; #endif + wxDECLARE_NO_COPY_CLASS(wxTextOutputStream); }; #endif