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

Work around a failure in TreeCtrlTestCase::SelectionChange() unit test.

Browse Source 
We were getting an extra event under MSW if the control was initially
unfocused, so do focus it. This is a work around as the extra event shouldn't
occur but I'm too afraid of changing wxMSW code itself so close to 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-10-14 15:07:51 +00:00
parent 9d7f0c5f7e
commit 6a51bf145f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/controls/treectrltest.cpp
View File

@@ -349,7 +349,14 @@ void TreeCtrlTestCase::CollapseExpandEvents()
void TreeCtrlTestCase::SelectionChange() void TreeCtrlTestCase::SelectionChange()
{ {
m_tree->ExpandAll(); m_tree->ExpandAll();
m_tree->UnselectAll();
// This is currently needed to work around a problem under wxMSW: clicking
// on an item in an unfocused control generates two selection change events
// because of the SetFocus() call in TVN_SELCHANGED handler in wxMSW code.
// This is, of course, wrong on its own, but fixing it without breaking
// anything else is non-obvious, so for now at least work around this
// problem in the test.
m_tree->SetFocus();
EventCounter changed(m_tree, wxEVT_TREE_SEL_CHANGED); EventCounter changed(m_tree, wxEVT_TREE_SEL_CHANGED);
EventCounter changing(m_tree, wxEVT_TREE_SEL_CHANGING); EventCounter changing(m_tree, wxEVT_TREE_SEL_CHANGING);
@@ -370,6 +377,9 @@ void TreeCtrlTestCase::SelectionChange()
sim.MouseClick(); sim.MouseClick();
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());
CPPUNIT_ASSERT_EQUAL(1, changing.GetCount());
sim.MouseMove(point2); sim.MouseMove(point2);
wxYield(); wxYield();