From 11db7d81d1f7d2faecac39b05960a5f5cbd15bc6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 20 Sep 2003 11:35:06 +0000 Subject: [PATCH] Unicode compilation fix (bug 809707) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textctrl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 6a3af8adab..9730fe9992 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -530,6 +530,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const if ( to == -1 ) to = len; +#if !wxUSE_UNICODE // we must use EM_STREAMOUT if we don't want to lose all characters // not representable in the current character set (EM_GETTEXTRANGE // simply replaces them with question marks...) @@ -556,6 +557,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const // StreamOut() wasn't used or failed, try to do it in normal way if ( str.empty() ) +#endif // !wxUSE_UNICODE { // alloc one extra WORD as needed by the control wxStringBuffer tmp(str, ++len); @@ -563,7 +565,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const TEXTRANGE textRange; textRange.chrg.cpMin = from; - textRange.chrg.cpMax = to == -1 ? len : to; + textRange.chrg.cpMax = to; textRange.lpstrText = p; (void)SendMessage(GetHwnd(), EM_GETTEXTRANGE, -- 2.45.2