AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix VC6 compilation of wxRichTextTable code.

Browse Source 
In addition to breaking VC6 build, the code also rather strangely declared
"row" inside a for loop first and then declared it in the function scope.

Leave just the second declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-06-29 12:53:21 +00:00
parent 1d84348c5a
commit 5d98e603bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbuffer.cpp
View File

@ -9397,7 +9397,8 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
const int colCount = table->GetColumnCount(); const int colCount = table->GetColumnCount();
wxArrayInt rowTops; wxArrayInt rowTops;
rowTops.Add(0, rowCount+1); rowTops.Add(0, rowCount+1);
for (int row = 0; row < rowCount; ++row) int row;
for (row = 0; row < rowCount; ++row)
{ {
for (int column = 0; column < colCount; ++column) for (int column = 0; column < colCount; ++column)
{ {
@ -9413,10 +9414,9 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
bool needsRelay = false; bool needsRelay = false;
int row, col;
for (row = 0; row < rowCount-1; ++row) // -1 as the bottom row can't rowspan for (row = 0; row < rowCount-1; ++row) // -1 as the bottom row can't rowspan
{ {
for (col = 0; col < colCount; ++col) for (int col = 0; col < colCount; ++col)
{ {
wxRichTextCell* cell = table->GetCell(row, col); wxRichTextCell* cell = table->GetCell(row, col);
if (cell && cell->IsShown()) if (cell && cell->IsShown())
@ -9473,7 +9473,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
// There were overflowing rowspanning cells, so layout yet again to make the increased row depths show // There were overflowing rowspanning cells, so layout yet again to make the increased row depths show
for (row = 0; row < rowCount; ++row) for (row = 0; row < rowCount; ++row)
{ {
for (col = 0; col < colCount; ++col) for (int col = 0; col < colCount; ++col)
{ {
wxRichTextCell* cell = table->GetCell(row, col); wxRichTextCell* cell = table->GetCell(row, col);
if (cell && cell->IsShown()) if (cell && cell->IsShown())