Unicode compilation fix (bug 809707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -530,6 +530,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const
|
|||||||
if ( to == -1 )
|
if ( to == -1 )
|
||||||
to = len;
|
to = len;
|
||||||
|
|
||||||
|
#if !wxUSE_UNICODE
|
||||||
// we must use EM_STREAMOUT if we don't want to lose all characters
|
// we must use EM_STREAMOUT if we don't want to lose all characters
|
||||||
// not representable in the current character set (EM_GETTEXTRANGE
|
// not representable in the current character set (EM_GETTEXTRANGE
|
||||||
// simply replaces them with question marks...)
|
// 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
|
// StreamOut() wasn't used or failed, try to do it in normal way
|
||||||
if ( str.empty() )
|
if ( str.empty() )
|
||||||
|
#endif // !wxUSE_UNICODE
|
||||||
{
|
{
|
||||||
// alloc one extra WORD as needed by the control
|
// alloc one extra WORD as needed by the control
|
||||||
wxStringBuffer tmp(str, ++len);
|
wxStringBuffer tmp(str, ++len);
|
||||||
@@ -563,7 +565,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const
|
|||||||
|
|
||||||
TEXTRANGE textRange;
|
TEXTRANGE textRange;
|
||||||
textRange.chrg.cpMin = from;
|
textRange.chrg.cpMin = from;
|
||||||
textRange.chrg.cpMax = to == -1 ? len : to;
|
textRange.chrg.cpMax = to;
|
||||||
textRange.lpstrText = p;
|
textRange.lpstrText = p;
|
||||||
|
|
||||||
(void)SendMessage(GetHwnd(), EM_GETTEXTRANGE,
|
(void)SendMessage(GetHwnd(), EM_GETTEXTRANGE,
|
||||||
|
Reference in New Issue
Block a user