Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset row and columns count in wxRichTextTable::ClearTable().

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-05-26 13:14:48 +00:00
parent 830c06655b
commit 0a6ec346d5
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextbuffer.cpp
View File

@@ -10087,6 +10087,8 @@ void wxRichTextTable::ClearTable()
{ {
m_cells.Clear(); m_cells.Clear();
DeleteChildren(); DeleteChildren();
m_rowCount = 0;
m_colCount = 0;
} }
bool wxRichTextTable::CreateTable(int rows, int cols) bool wxRichTextTable::CreateTable(int rows, int cols)

6
tests/controls/richtextctrltest.cpp
View File

@@ -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->Clear();
m_rich->SetFocusObject(NULL); m_rich->SetFocusObject(NULL);
} }