From 0a6ec346d56158e98ee91e2661821940a825e899 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 26 May 2013 13:14:48 +0000 Subject: [PATCH 1/1] Reset row and columns count in wxRichTextTable::ClearTable(). No real changes, just update the internal variables in ClearTable() to avoid inconsistent internal state, even if this doesn't seem to result in any problems for now. Closes #15190. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 2 ++ tests/controls/richtextctrltest.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 19f5452f88..dfcc768eea 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -10087,6 +10087,8 @@ void wxRichTextTable::ClearTable() { m_cells.Clear(); DeleteChildren(); + m_rowCount = 0; + m_colCount = 0; } bool wxRichTextTable::CreateTable(int rows, int cols) diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp index e30c91d085..a01cf7a611 100644 --- a/tests/controls/richtextctrltest.cpp +++ b/tests/controls/richtextctrltest.cpp @@ -881,6 +881,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); } -- 2.45.2