fix changing size of merged cells (#9736)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-07-15 14:36:28 +00:00
parent 15840e670e
commit a6b2078ddd

View File

@ -10194,7 +10194,7 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
wxT("wxGrid::SetCellSize setting cell size to < 1"));
// if this was already a multicell then "turn off" the other cells first
if ((cell_rows > 1) || (cell_rows > 1))
if ((cell_rows > 1) || (cell_cols > 1))
{
int i, j;
for (j=row; j < row + cell_rows; j++)