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

Clear the selection in wxGrid::SetTable

Browse Source 
The selection in m_selection was not considered at all so it was worked not
correctly any way.
This commit is contained in:
Ilya Sinitsyn
2020-02-25 23:45:42 +07:00
committed by Vadim Zeitlin
parent d4919d3334
commit 779d3f7f17
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/grid.cpp
View File

@@ -2753,7 +2753,6 @@ wxGrid::SetTable(wxGridTableBase *table,
bool takeOwnership, bool takeOwnership,
wxGrid::wxGridSelectionModes selmode ) wxGrid::wxGridSelectionModes selmode )
{ {
bool checkSelection = false;
if ( m_created ) if ( m_created )
{ {
// stop all processing // stop all processing
@@ -2785,7 +2784,6 @@ wxGrid::SetTable(wxGridTableBase *table,
m_numCols = 0; m_numCols = 0;
m_numFrozenRows = 0; m_numFrozenRows = 0;
m_numFrozenCols = 0; m_numFrozenCols = 0;
checkSelection = true;
// kill row and column size arrays // kill row and column size arrays
m_colWidths.Empty(); m_colWidths.Empty();
@@ -2809,28 +2807,6 @@ wxGrid::SetTable(wxGridTableBase *table,
SetNativeHeaderColCount(); SetNativeHeaderColCount();
m_selection = new wxGridSelection( this, selmode ); m_selection = new wxGridSelection( this, selmode );
if (checkSelection)
{
// If the newly set table is smaller than the
// original one current cell and selection regions
// might be invalid,
m_selectedBlockCorner = wxGridNoCellCoords;
m_currentCellCoords =
wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
wxMin(m_numCols, m_currentCellCoords.GetCol()));
if (m_selectedBlockTopLeft.GetRow() >= m_numRows ||
m_selectedBlockTopLeft.GetCol() >= m_numCols)
{
m_selectedBlockTopLeft = wxGridNoCellCoords;
m_selectedBlockBottomRight = wxGridNoCellCoords;
}
else
m_selectedBlockBottomRight =
wxGridCellCoords(wxMin(m_numRows,
m_selectedBlockBottomRight.GetRow()),
wxMin(m_numCols,
m_selectedBlockBottomRight.GetCol()));
}
CalcDimensions(); CalcDimensions();
m_created = true; m_created = true;