Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/interface/wx/txtstrm.h b/interface/wx/txtstrm.h
index 89dd37741a7cb32c2e420b3661f32e597eee294f..1fb73d3db3aeed976d50c2250ec3097ff2d9b4cc 100644 (file)
--- a/interface/wx/txtstrm.h
+++ b/interface/wx/txtstrm.h
@@ -3,14 +3,13 @@
 // Purpose:     interface of wxTextInputStream
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxTextInputStream
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 
 /**
     @class wxTextInputStream
 /////////////////////////////////////////////////////////////////////////////
 
 
 
 /**
     @class wxTextInputStream

-    @wxheader{txtstrm.h}

 
     This class provides functions that reads text data using an input stream,
     allowing you to read text, floats, and integers.
 
     This class provides functions that reads text data using an input stream,
     allowing you to read text, floats, and integers.


@@ -66,8 +65,7 @@ public:
             <b>In Unicode build only:</b> The encoding converter used to
             convert the bytes in the underlying input stream to characters.
     */
             <b>In Unicode build only:</b> The encoding converter used to
             convert the bytes in the underlying input stream to characters.
     */

-    wxTextInputStream(wxInputStream& stream,
-                      const wxString& sep = " \t",
+    wxTextInputStream(wxInputStream& stream, const wxString& sep = " \t",

                       const wxMBConv& conv = wxConvAuto());
 
     /**
                       const wxMBConv& conv = wxConvAuto());
 
     /**


@@ -75,6 +73,13 @@ public:
     */
     ~wxTextInputStream();
 
     */
     ~wxTextInputStream();
 

+    /**
+        Returns a pointer to the underlying input stream object.
+
+        @since 2.9.2
+    */
+    const wxInputStream& GetInputStream() const;
+

     /**
         Reads a character, returns 0 if there are no more characters in the
         stream.
     /**
         Reads a character, returns 0 if there are no more characters in the
         stream.


@@ -194,7 +199,6 @@ typedef enum
 
 /**
     @class wxTextOutputStream
 
 /**
     @class wxTextOutputStream

-    @wxheader{txtstrm.h}

 
     This class provides functions that write text data using an output stream,
     allowing you to write text, floats, and integers.
 
     This class provides functions that write text data using an output stream,
     allowing you to write text, floats, and integers.


@@ -242,7 +246,7 @@ public:
 
         Also calls Flush().
     */
 
         Also calls Flush().
     */

-    ~wxTextOutputStream();
+    virtual ~wxTextOutputStream();

 
     /**
         Flushes the stream.
 
     /**
         Flushes the stream.


@@ -255,6 +259,13 @@ public:
      */
     void Flush();
 
      */
     void Flush();
 

+    /**
+        Returns a pointer to the underlying output stream object.
+
+        @since 2.9.2
+    */
+    const wxOutputStream& GetOutputStream() const;
+

     /**
         Returns the end-of-line mode. One of ::wxEOL_DOS, ::wxEOL_MAC and
         ::wxEOL_UNIX.
     /**
         Returns the end-of-line mode. One of ::wxEOL_DOS, ::wxEOL_MAC and
         ::wxEOL_UNIX.


@@ -264,7 +275,7 @@ public:
     /**
         Writes a character to the stream.
     */
     /**
         Writes a character to the stream.
     */

-    void PutChar(wxChar c);
+    wxTextOutputStream& PutChar(wxChar c);

 
     /**
         Set the end-of-line mode. One of ::wxEOL_NATIVE, ::wxEOL_DOS,
 
     /**
         Set the end-of-line mode. One of ::wxEOL_NATIVE, ::wxEOL_DOS,