Updated to Scintilla from 1.45 to 1.47

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 45b3b4203026b6f1cd2cbb0b11f925aa6328cb50..d7948933f7e3a3d6794d4d54342b1261769f8214 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "txtstrm.h"
 #endif
 
@@ -28,68 +28,81 @@ typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 
 WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
 
-class WXDLLEXPORT wxTextInputStream {
+class WXDLLEXPORT wxTextInputStream
+{
 public:
-  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 );
+    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>>(char& 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<<(char 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