cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'grid-delete-rows-crash-fix'

Browse Source 
Don't use invalid grid cell coordinates when deleting grid rows.

See https://github.com/wxWidgets/wxWidgets/pull/1669
This commit is contained in:
Vadim Zeitlin 2019-12-05 17:35:05 +01:00
commit 6f95676f3e
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/generic/grid.cpp
View File

@ -3640,13 +3640,21 @@ void wxGrid::UpdateCurrentCellOnRedim()
}
else
{
int col = m_currentCellCoords.GetCol();
int row = m_currentCellCoords.GetRow();
if (col >= m_numCols)
col = m_numCols - 1;
if (row >= m_numRows)
row = m_numRows - 1;
SetCurrentCell(row, col);
// Check if the current cell coordinates are still valid.
wxGridCellCoords updatedCoords = m_currentCellCoords;
if ( updatedCoords.GetCol() >= m_numCols )
updatedCoords.SetCol(m_numCols - 1);
if ( updatedCoords.GetRow() >= m_numRows )
updatedCoords.SetRow(m_numRows - 1);
// And change them if they're not.
if ( updatedCoords != m_currentCellCoords )
{
// Prevent SetCurrentCell() from redrawing the previous current
// cell whose coordinates are invalid now.
m_currentCellCoords = wxGridNoCellCoords;
SetCurrentCell(updatedCoords);
}
}
}
}
@ -5751,13 +5759,16 @@ bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
m_currentCellCoords = coords;
wxGridCellAttr *attr = GetCellAttr( coords );
#if !defined(__WXMAC__)
wxClientDC dc( currentGridWindow );
PrepareDCFor(dc, currentGridWindow);
DrawCellHighlight( dc, attr );
if ( !GetBatchCount() )
{
wxGridCellAttr *attr = GetCellAttr( coords );
wxClientDC dc( currentGridWindow );
PrepareDCFor(dc, currentGridWindow);
DrawCellHighlight( dc, attr );
attr->DecRef();
}
#endif
attr->DecRef();
return true;
}