From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 5 Apr 2006 23:19:09 +0000 (+0000)
Subject: really fixed number of bytes written in WriteString() in Unicode mode
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bfaee57e812ccfb264170dd9a03f0bb186c1773b

really fixed number of bytes written in WriteString() in Unicode mode


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 299a97cf29..20b583604c 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -415,9 +415,8 @@ void wxTextOutputStream::WriteString(const wxString& string)
     }
 
 #if wxUSE_UNICODE
-    // note that we must not write the trailing NUL here
     wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
-    m_output.Write(buffer, len + 1 - m_conv->GetMBNulLen());
+    m_output.Write(buffer, len);
 #else
     m_output.Write(out.c_str(), out.length() );
 #endif