Fix VC6 compilation of wxRichTextTable code.

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index b15c5c5f494a80fc7aeb8ce90c162d3b39773f0f..86c41cfb5accfda3db465aff348302ed6bb4f207 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -9397,7 +9397,8 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
     const int colCount = table->GetColumnCount();
     wxArrayInt rowTops;
     rowTops.Add(0, rowCount+1);
     const int colCount = table->GetColumnCount();
     wxArrayInt rowTops;
     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);
             if (cell && cell->IsShown())
         {
             wxRichTextCell* cell = table->GetCell(row, col);
             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
     for (row = 0; row < rowCount; ++row)
     {
     // There were overflowing rowspanning cells, so layout yet again to make the increased row depths show
     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);
             if (cell && cell->IsShown())
         {
             wxRichTextCell* cell = table->GetCell(row, col);
             if (cell && cell->IsShown())