Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/txtstrm.h b/interface/wx/txtstrm.h
index 46c364a4f24646acd321e2c0851d8c2e232e2056..1fb73d3db3aeed976d50c2250ec3097ff2d9b4cc 100644 (file)
--- a/interface/wx/txtstrm.h
+++ b/interface/wx/txtstrm.h
@@ -3,7 +3,7 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -65,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());
 
     /**


@@ -74,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.


@@ -253,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.


@@ -262,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,