Fix wxRichTextCtrl test compilation.
Work around broken pre-C++98 for loop scoping rules in VC6. See #15184. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -776,6 +776,8 @@ void RichTextCtrlTestCase::Table()
|
||||
// Run the tests twice: first for the original table, then for a contained one
|
||||
for (int t = 0; t < 2; ++t)
|
||||
{
|
||||
size_t n; // FIXME-VC6: outside of the loops for VC6 only.
|
||||
|
||||
// Undo() and Redo() switch table instances, so invalidating 'table'
|
||||
// The containing paragraph isn't altered, and so can be used to find the current object
|
||||
wxRichTextParagraph* para = wxDynamicCast(table->GetParent(), wxRichTextParagraph);
|
||||
@@ -785,7 +787,7 @@ void RichTextCtrlTestCase::Table()
|
||||
CPPUNIT_ASSERT(table->GetRowCount() == 1);
|
||||
|
||||
// Test adding columns and rows
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->BeginBatchUndo("Add col and row");
|
||||
|
||||
@@ -798,7 +800,7 @@ void RichTextCtrlTestCase::Table()
|
||||
CPPUNIT_ASSERT(table->GetRowCount() == 4);
|
||||
|
||||
// Test deleting columns and rows
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->BeginBatchUndo("Delete col and row");
|
||||
|
||||
@@ -812,7 +814,7 @@ void RichTextCtrlTestCase::Table()
|
||||
|
||||
// Test undo, first of the deletions...
|
||||
CPPUNIT_ASSERT(m_rich->CanUndo());
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->Undo();
|
||||
}
|
||||
@@ -821,7 +823,7 @@ void RichTextCtrlTestCase::Table()
|
||||
CPPUNIT_ASSERT(table->GetRowCount() == 4);
|
||||
|
||||
// ...then the additions
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->Undo();
|
||||
}
|
||||
@@ -832,7 +834,7 @@ void RichTextCtrlTestCase::Table()
|
||||
|
||||
// Similarly test redo. Additions:
|
||||
CPPUNIT_ASSERT(m_rich->CanRedo());
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->Redo();
|
||||
}
|
||||
@@ -841,7 +843,7 @@ void RichTextCtrlTestCase::Table()
|
||||
CPPUNIT_ASSERT(table->GetRowCount() == 4);
|
||||
|
||||
// Deletions:
|
||||
for (size_t n = 0; n < 3; ++n)
|
||||
for (n = 0; n < 3; ++n)
|
||||
{
|
||||
m_rich->Redo();
|
||||
}
|
||||
|
Reference in New Issue
Block a user