X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7f73361b999778884506a6c7ce2a1548d53a094..e319bb30f7e88242f56144fcc279b57047566a6b:/src/common/txtstrm.cpp?ds=sidebyside

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index cbc90a4dae..d2e08f5c8f 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        txtstrm.cpp
+// Name:        src/common/txtstrm.cpp
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -178,11 +178,15 @@ double wxTextInputStream::ReadDouble()
     return wxStrtod(word.c_str(), 0);
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
+#endif // WXWIN_COMPATIBILITY_2_6
+
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
@@ -193,9 +197,6 @@ wxString wxTextInputStream::ReadLine()
         if(c == wxEOT)
             break;
 
-        if ( !m_input )
-            break;
-
         if (EatEOL(c))
             break;
 
@@ -414,10 +415,9 @@ void wxTextOutputStream::WriteString(const wxString& string)
         out << c;
     }
 
-    // We must not write the trailing NULL here
 #if wxUSE_UNICODE
-    wxCharBuffer buffer = m_conv->cWC2MB( out );
-    m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+    wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
+    m_output.Write(buffer, len);
 #else
     m_output.Write(out.c_str(), out.length() );
 #endif