Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / txtstrm.h

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index afa18e3bce7a95364247873b6d4cb357fb26e434..5b114305a885e0912bb102d026cf207fca19db9e 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -28,61 +28,81 @@ typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 
 WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
 
 
 WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
 

-class WXDLLEXPORT wxTextInputStream {
+class WXDLLEXPORT wxTextInputStream
+{

 public:
 public:

-  wxTextInputStream(wxInputStream& s);
-  ~wxTextInputStream();
-
-  wxUint32 Read32();
-  wxUint16 Read16();
-  wxUint8 Read8();
-  double ReadDouble();
-  wxString ReadString();
-
-  // Operators
-  wxTextInputStream& operator>>(wxString& line);
-  wxTextInputStream& operator>>(wxChar& 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;
-  
-  wxChar NextNonWhiteSpace();
-  void SkipIfEndOfLine( wxChar c );
+    wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t") );
+    ~wxTextInputStream();
+
+    wxUint32 Read32();
+    wxUint16 Read16();
+    wxUint8  Read8();
+    double   ReadDouble();
+    wxString ReadString();  // deprecated use ReadLine or ReadWord instead
+    wxString ReadLine();
+    wxString ReadWord();
+
+    wxString GetStringSeparators() const { return m_separators; }
+    void SetStringSeparators(const wxString &c) { m_separators = c; }
+
+    // Operators
+    wxTextInputStream& operator>>(wxString& word);
+    wxTextInputStream& operator>>(wxChar& 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;
+
+    bool   EatEOL(const wxChar &c);
+    wxChar NextNonSeparators();
+    void   SkipIfEndOfLine( wxChar c );

 };
 
 };
 

-class WXDLLEXPORT wxTextOutputStream {
- public:
-  wxTextOutputStream(wxOutputStream& s);
-  ~wxTextOutputStream();
-
-  void Write32(wxUint32 i);
-  void Write16(wxUint16 i);
-  void Write8(wxUint8 i);
-  void WriteDouble(double d);
-  void WriteString(const wxString& string);
-  
-  wxTextOutputStream& operator<<(const wxChar *string);
-  wxTextOutputStream& operator<<(const wxString& string);
-  wxTextOutputStream& operator<<(wxChar 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;
+typedef enum {
+  wxEOL_NATIVE,
+  wxEOL_UNIX,
+  wxEOL_MAC,
+  wxEOL_DOS
+} wxEOL;
+
+class WXDLLEXPORT wxTextOutputStream
+{
+public:
+    wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE );
+    virtual ~wxTextOutputStream();
+
+    void SetMode( wxEOL mode = wxEOL_NATIVE );
+    wxEOL GetMode() { return m_mode; }
+
+    void Write32(wxUint32 i);
+    void Write16(wxUint16 i);
+    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<<(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;

 };
 
 #endif
 };
 
 #endif