Minor patch for state icons patch

[wxWidgets.git] / interface / sstream.h

diff --git a/interface/sstream.h b/interface/sstream.h
index 8ff3234cc53f01df008318eadea82f84f90f6b4a..9fb340b7050ae9cd0dd512e82acef45790fc1975 100644 (file)
--- a/interface/sstream.h
+++ b/interface/sstream.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sstream.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sstream.h

-// Purpose:     documentation for wxStringInputStream class
+// Purpose:     interface of wxStringInputStream

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license


@@ -9,10 +9,10 @@
 /**
     @class wxStringInputStream
     @wxheader{sstream.h}
 /**
     @class wxStringInputStream
     @wxheader{sstream.h}

-    
+

     This class implements an input stream which reads data from a string. It
     supports seeking.
     This class implements an input stream which reads data from a string. It
     supports seeking.

-    
+

     @library{wxbase}
     @category{streams}
 */
     @library{wxbase}
     @category{streams}
 */


@@ -28,14 +28,15 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxStringOutputStream
     @wxheader{sstream.h}
 /**
     @class wxStringOutputStream
     @wxheader{sstream.h}

-    
+

     This class implements an output stream which writes data either to a
     user-provided or internally allocated string. Note that currently this stream
     does not support seeking but can tell its current position.
     This class implements an output stream which writes data either to a
     user-provided or internally allocated string. Note that currently this stream
     does not support seeking but can tell its current position.

-    
+

     @library{wxbase}
     @category{streams}
 */
     @library{wxbase}
     @category{streams}
 */


@@ -43,20 +44,29 @@ class wxStringOutputStream : public wxOutputStream
 {
 public:
     /**
 {
 public:
     /**

+        Construct a new stream object writing the data to a string.
+

         If the provided pointer is non-@NULL, data will be written to it.
         If the provided pointer is non-@NULL, data will be written to it.

-        Otherwise, an internal string is used for the data written to this stream, use 
-        GetString() to get access to it.
-        
-        If @e str is used, data written to the stream is appended to the current
+        Otherwise, an internal string is used for the data written to this
+        stream, use GetString() to get access to it.
+
+        If @a str is used, data written to the stream is appended to the current

         contents of it, i.e. the string is not cleared here. However if it is not
         empty, the positions returned by wxOutputStream::TellO will be
         offset by the initial string length, i.e. initial stream position will be the
         initial length of the string and not 0.
         contents of it, i.e. the string is not cleared here. However if it is not
         empty, the positions returned by wxOutputStream::TellO will be
         offset by the initial string length, i.e. initial stream position will be the
         initial length of the string and not 0.

+
+        Notice that the life time of @a conv must be greater than the life time
+        of this object itself as it stores a reference to it. Also notice that
+        with default value of this argument the data written to the stream must
+        be valid UTF-8, pass @c wxConvISO8859_1 to deal with arbitrary 8 bit
+        data.

     */
     */

-    wxStringOutputStream(wxString str = @NULL);
+    wxStringOutputStream(wxString str = NULL, wxMBConv& conv = wxConvUTF8);

 
     /**
         Returns the string containing all the data written to the stream so far.
     */
 
     /**
         Returns the string containing all the data written to the stream so far.
     */

-    const wxString GetString();
+    const wxString& GetString() const;

 };
 };

+