Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept list of separators as a wxString instead of wxChar\nTurn NextNonWhiteSpace to NextNonSeparators\nIntroduce EatEOL (major factorization)\nFix GetC() call on last char introduce a bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Sylvain Bougnoux
1999-10-29 11:18:46 +00:00
parent 5612a51858
commit 191549ed17
2 changed files with 71 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/txtstrm.h
View File

@@ -30,7 +30,7 @@ WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
class WXDLLEXPORT wxTextInputStream {
public:
wxTextInputStream(wxInputStream& s, const wxChar &sep=wxT(' '));
wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t"));
~wxTextInputStream();
wxUint32 Read32();
@@ -41,8 +41,8 @@ public:
wxString ReadLine();
wxString ReadWord();
wxChar GetStringSeparator() const { return m_string_separator;}
void SetStringSeparator(const wxChar &c) { m_string_separator=c;}
wxString GetStringSeparators() const { return m_separators;}
void SetStringSeparators(const wxString &c) { m_separators=c;}
// Operators
wxTextInputStream& operator>>(wxString& word);
@@ -57,11 +57,12 @@ public:
wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
protected:
wxInputStream *m_input;
wxChar m_string_separator;
wxChar NextNonWhiteSpace();
void SkipIfEndOfLine( wxChar c );
wxInputStream &m_input;
wxString m_separators;
bool EatEOL(const wxChar &c);
wxChar NextNonSeparators();
void SkipIfEndOfLine( wxChar c );
};
class WXDLLEXPORT wxTextOutputStream {
@@ -88,7 +89,7 @@ class WXDLLEXPORT wxTextOutputStream {
wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); }
protected:
wxOutputStream *m_output;
wxOutputStream &m_output;
};
#endif