From 5326ac9c739a6a830884c0d61fb0c36ab008a252 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Sep 2007 11:16:04 +0000 Subject: [PATCH] chop off the unwanted \r from GetLineText() return value for richedit 2.0 controls (patch 1780110) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textctrl.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index cfe9b8364a..33ee0b7609 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1709,9 +1709,16 @@ wxString wxTextCtrl::GetLineText(long lineNo) const // should never see it if ( buf[len - 2] == _T('\r') && buf[len - 1] == _T('\n') ) { + // richedit 1.0 uses "\r\n" as line terminator, so remove "\r" + // here and "\n" below buf[len - 2] = _T('\n'); len--; } + else if ( buf[len - 1] == _T('\r') ) + { + // richedit 2.0+ uses only "\r", replace it with "\n" + buf[len - 1] = _T('\n'); + } } #endif // wxUSE_RICHEDIT