Made wxGTK's wxEventLoop::IsRunning a little more consistent with

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 1f5c68b45cb1086a5e3d1c9c530e11599a37318f..0090deb4e965bea327d17de261a47486a6c3be4c 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "txtstrm.h"
 #endif
 
 #pragma interface "txtstrm.h"
 #endif
 


@@ -20,16 +20,23 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT_BASE wxTextInputStream;
-class WXDLLEXPORT_BASE wxTextOutputStream;
+class WXDLLIMPEXP_BASE wxTextInputStream;
+class WXDLLIMPEXP_BASE wxTextOutputStream;

 
 typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&);
 typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 
 
 typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&);
 typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 

-WXDLLEXPORT_BASE wxTextOutputStream &endl( wxTextOutputStream &stream );
+WXDLLIMPEXP_BASE wxTextOutputStream &endl( wxTextOutputStream &stream );

 
 
 
 

-class WXDLLEXPORT_BASE wxTextInputStream
+#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. 
+// 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
 {
 public:
 #if wxUSE_UNICODE


@@ -39,13 +46,17 @@ public:
 #endif
     ~wxTextInputStream();
 
 #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();
     double   ReadDouble();

-    wxString ReadString();  // deprecated use ReadLine or ReadWord instead
+    wxString ReadString();  // deprecated: use ReadLine or ReadWord instead

     wxString ReadLine();
     wxString ReadWord();
     wxString ReadLine();
     wxString ReadWord();

+    wxChar   GetChar() { wxChar c = NextChar(); return c != wxEOT ? c : 0; }

 
     wxString GetStringSeparators() const { return m_separators; }
     void SetStringSeparators(const wxString &c) { m_separators = c; }
 
     wxString GetStringSeparators() const { return m_separators; }
     void SetStringSeparators(const wxString &c) { m_separators = c; }


@@ -65,14 +76,19 @@ public:
 protected:
     wxInputStream &m_input;
     wxString m_separators;
 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;
 #endif
 
     bool   EatEOL(const wxChar &c);
     
 #if wxUSE_UNICODE
     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();
     wxChar NextNonSeparators();

-    void   SkipIfEndOfLine( wxChar c );
+
+    DECLARE_NO_COPY_CLASS(wxTextInputStream)

 };
 
 typedef enum
 };
 
 typedef enum


@@ -83,7 +99,7 @@ typedef enum
   wxEOL_DOS
 } wxEOL;
 
   wxEOL_DOS
 } wxEOL;
 

-class WXDLLEXPORT_BASE wxTextOutputStream
+class WXDLLIMPEXP_BASE wxTextOutputStream

 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE


@@ -105,6 +121,9 @@ public:
     wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);
     wxTextOutputStream& operator<<(const wxChar *string);
     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);
     wxTextOutputStream& operator<<(wxInt16 c);
     wxTextOutputStream& operator<<(wxInt32 c);
     wxTextOutputStream& operator<<(wxUint16 c);


@@ -122,6 +141,7 @@ protected:
     wxMBConv &m_conv;
 #endif
 
     wxMBConv &m_conv;
 #endif
 

+    DECLARE_NO_COPY_CLASS(wxTextOutputStream)

 };
 
 #endif
 };
 
 #endif