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

Fix access to row/column coordinates in wxGrid freezing code

Browse Source 
The various arrays containing row/column coordinates (m_rowHeights,
m_rowBottoms, m_colWidths, m_colRights) must not be accessed directly as
they are empty by default, and are only initialized if any rows/columns
have non-default width/height.

Use safe accessor functions instead.

See https://github.com/wxWidgets/wxWidgets/pull/1417
This commit is contained in:
AliKet
2019-08-25 00:27:28 +02:00
committed by Vadim Zeitlin
parent 9d17d5c376
commit 0b7a7141e3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/grid.cpp
View File

@@ -2829,10 +2829,10 @@ void wxGrid::CalcWindowSizes()
int fgw = 0, fgh = 0;
for ( int i = 0; i < m_numFrozenRows; i++ )
fgh += m_rowHeights[i];
fgh += GetRowHeight(i);
for ( int i = 0; i < m_numFrozenCols; i++ )
fgw += m_colWidths[i];
fgw += GetColWidth(i);
// the grid may be too small to have enough space for the labels yet, don't
// size the windows to negative sizes in this case
@@ -4906,8 +4906,8 @@ bool wxGrid::FreezeTo(int row, int col)
cw -= m_rowLabelWidth;
ch -= m_colLabelHeight;
if ((row > 0 && m_rowBottoms[row - 1] >= ch) ||
(col > 0 && m_colRights[col - 1] >= cw))
if ((row > 0 && GetRowBottom(row - 1) >= ch) ||
(col > 0 && GetColRight(col - 1) >= cw))
return false;
// check all involved cells for merged ones