From 696f3e9dd0ba59c5ed8d7ea9ceb45f92687dcaf2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 Feb 2008 21:06:17 +0000 Subject: [PATCH] correct indices used in StringToLines() (modified patch 1882985) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 91cf67383e..ecadf47f42 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -8106,6 +8106,7 @@ void wxGrid::DrawTextRectangle(wxDC& dc, // Split multi-line text up into an array of strings. // Any existing contents of the string array are preserved. // +// TODO: refactor wxTextFile::Read() and reuse the same code from here void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const { int startPos = 0; @@ -8126,7 +8127,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const } else { - lines.Add( value.Mid(startPos, pos) ); + lines.Add( tVal.Mid(startPos, pos) ); } startPos += pos + 1; @@ -8134,7 +8135,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const if ( startPos < (int)value.length() ) { - lines.Add( value.Mid( startPos ) ); + lines.Add( tVal.Mid( startPos ) ); } } -- 2.45.2