From b26613c25b02a372bab6f712fed5dd923ac27ba3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 Oct 2003 01:23:23 +0000 Subject: [PATCH] fixed conversion from Unicode in StreamOut() once again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textctrl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index f7b8d15231..7dd6a84fcf 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -822,13 +822,13 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const // decreased by wxRichEditStreamOut *(wchBuf.data() + data.len) = L'\0'; - // now convert to the given encoding (this is a lossful conversion but - // what else can we do) + // now convert to the given encoding (this is a possibly lossful + // conversion but what else can we do) wxCSConv conv(encoding); - size_t lenNeeded = conv.WC2MB(NULL, wchBuf, len); - if ( lenNeeded ) + size_t lenNeeded = conv.WC2MB(NULL, wchBuf, 0); + if ( lenNeeded++ ) { - conv.WC2MB(wxStringBuffer(out, lenNeeded), wchBuf, len); + conv.WC2MB(wxStringBuffer(out, lenNeeded), wchBuf, lenNeeded); } } -- 2.45.2