From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 10 Sep 2007 11:16:04 +0000 (+0000)
Subject: chop off the unwanted \r from GetLineText() return value for richedit 2.0 controls... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e1ef6b5da5df7f9730bffb4c3578e1aba28169e4

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/trunk@48627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 5b64187e79..97c0559a8b 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1712,9 +1712,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