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
This commit is contained in:
@@ -8106,6 +8106,7 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
|
|||||||
// Split multi-line text up into an array of strings.
|
// Split multi-line text up into an array of strings.
|
||||||
// Any existing contents of the string array are preserved.
|
// 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
|
void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
|
||||||
{
|
{
|
||||||
int startPos = 0;
|
int startPos = 0;
|
||||||
@@ -8126,7 +8127,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
lines.Add( value.Mid(startPos, pos) );
|
lines.Add( tVal.Mid(startPos, pos) );
|
||||||
}
|
}
|
||||||
|
|
||||||
startPos += pos + 1;
|
startPos += pos + 1;
|
||||||
@@ -8134,7 +8135,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
|
|||||||
|
|
||||||
if ( startPos < (int)value.length() )
|
if ( startPos < (int)value.length() )
|
||||||
{
|
{
|
||||||
lines.Add( value.Mid( startPos ) );
|
lines.Add( tVal.Mid( startPos ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user