Fixed capitalisation

[wxWidgets.git] / tests / controls / richtextctrltest.cpp

diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp
index 9b9e9ac442c2507422a607c395cb665cffcadeae..8f704b934ca265f73ac3e87280dc68c9d32c9295 100644 (file)
--- a/tests/controls/richtextctrltest.cpp
+++ b/tests/controls/richtextctrltest.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxRichTextCtrl unit test
 // Author:      Steven Lamerton
 // Created:     2010-07-07
 // Purpose:     wxRichTextCtrl unit test
 // Author:      Steven Lamerton
 // Created:     2010-07-07

-// RCS-ID:      $Id$

 // Copyright:   (c) 2010 Steven Lamerton
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 2010 Steven Lamerton
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -775,7 +774,9 @@ void RichTextCtrlTestCase::Table()
 
     // Run the tests twice: first for the original table, then for a contained one
     for (int t = 0; t < 2; ++t)
 
     // 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);
         // 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,26 +786,26 @@ void RichTextCtrlTestCase::Table()
         CPPUNIT_ASSERT(table->GetRowCount() == 1);
 
         // Test adding columns and rows
         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");
 
             table->AddColumns(0, 1);
             table->AddRows(0, 1);
         {
             m_rich->BeginBatchUndo("Add col and row");
 
             table->AddColumns(0, 1);
             table->AddRows(0, 1);

-            
+

             m_rich->EndBatchUndo();
         }
         CPPUNIT_ASSERT(table->GetColumnCount() == 4);
         CPPUNIT_ASSERT(table->GetRowCount() == 4);
 
         // Test deleting columns and rows
             m_rich->EndBatchUndo();
         }
         CPPUNIT_ASSERT(table->GetColumnCount() == 4);
         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");
 
             table->DeleteColumns(table->GetColumnCount() - 1, 1);
             table->DeleteRows(table->GetRowCount() - 1, 1);
         {
             m_rich->BeginBatchUndo("Delete col and row");
 
             table->DeleteColumns(table->GetColumnCount() - 1, 1);
             table->DeleteRows(table->GetRowCount() - 1, 1);

-            
+

             m_rich->EndBatchUndo();
         }
         CPPUNIT_ASSERT(table->GetColumnCount() == 1);
             m_rich->EndBatchUndo();
         }
         CPPUNIT_ASSERT(table->GetColumnCount() == 1);


@@ -812,7 +813,7 @@ void RichTextCtrlTestCase::Table()
 
         // Test undo, first of the deletions...
         CPPUNIT_ASSERT(m_rich->CanUndo());
 
         // 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();
         }
         {
             m_rich->Undo();
         }


@@ -821,7 +822,7 @@ void RichTextCtrlTestCase::Table()
         CPPUNIT_ASSERT(table->GetRowCount() == 4);
 
         // ...then the additions
         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();
         }
         {
             m_rich->Undo();
         }


@@ -832,7 +833,7 @@ void RichTextCtrlTestCase::Table()
 
         // Similarly test redo. Additions:
         CPPUNIT_ASSERT(m_rich->CanRedo());
 
         // 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();
         }
         {
             m_rich->Redo();
         }


@@ -841,7 +842,7 @@ void RichTextCtrlTestCase::Table()
         CPPUNIT_ASSERT(table->GetRowCount() == 4);
 
         // Deletions:
         CPPUNIT_ASSERT(table->GetRowCount() == 4);
 
         // Deletions:

-        for (size_t n = 0; n < 3; ++n)
+        for (n = 0; n < 3; ++n)

         {
             m_rich->Redo();
         }
         {
             m_rich->Redo();
         }


@@ -863,7 +864,7 @@ void RichTextCtrlTestCase::Table()
         CPPUNIT_ASSERT(table->GetColumnCount() == 2);
         CPPUNIT_ASSERT(table->GetRowCount() == 2);
         m_rich->EndSuppressUndo();
         CPPUNIT_ASSERT(table->GetColumnCount() == 2);
         CPPUNIT_ASSERT(table->GetRowCount() == 2);
         m_rich->EndSuppressUndo();

-        
+

         m_rich->GetCommandProcessor()->ClearCommands(); // otherwise the command-history from this loop will cause CPPUNIT_ASSERT failures in the next one
 
         if (t == 0)
         m_rich->GetCommandProcessor()->ClearCommands(); // otherwise the command-history from this loop will cause CPPUNIT_ASSERT failures in the next one
 
         if (t == 0)


@@ -879,6 +880,12 @@ void RichTextCtrlTestCase::Table()
         }
     }
 
         }
     }
 

+    // Test ClearTable()
+    table->ClearTable();
+    CPPUNIT_ASSERT_EQUAL(0, table->GetCells().GetCount());
+    CPPUNIT_ASSERT_EQUAL(0, table->GetColumnCount());
+    CPPUNIT_ASSERT_EQUAL(0, table->GetRowCount());
+

     m_rich->Clear();
     m_rich->SetFocusObject(NULL);
 }
     m_rich->Clear();
     m_rich->SetFocusObject(NULL);
 }