Do nothing in wxMemoryDC::SelectObject() if the bitmap is already selected.

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

diff --git a/interface/wx/txtstrm.h b/interface/wx/txtstrm.h
index 46c364a4f24646acd321e2c0851d8c2e232e2056..3ad872c9deb03e0be00132193d9d7eed850ca610 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$
-// 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.
     */
-    wxTextInputStream(wxInputStream& stream,
-                      const wxString& sep = " \t",
+    wxTextInputStream(wxInputStream& stream, const wxString& sep = " \t",
                       const wxMBConv& conv = wxConvAuto());
 
     /**
@@ -262,7 +261,7 @@ public:
     /**
         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,