moving click point sightly more inside, #ifndef tests failing with the generic implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-11 22:21:30 +00:00
parent 9150fa99d4
commit 689c6ca6ef

View File

@@ -175,11 +175,7 @@ void ListBaseTestCase::ChangeMode()
void ListBaseTestCase::ItemClick() void ListBaseTestCase::ItemClick()
{ {
// FIXME: This test fail under wxGTK because we get 3 FOCUSED events and #if wxUSE_UIACTIONSIMULATOR
// 2 SELECTED ones instead of the one of each we expect for some
// reason, this needs to be debugged as it may indicate a bug in the
// generic wxListCtrl implementation.
#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__)
#ifdef __WXMSW__ #ifdef __WXMSW__
// FIXME: This test fails on MSW buildbot slaves although works fine on // FIXME: This test fails on MSW buildbot slaves although works fine on
@@ -210,7 +206,7 @@ void ListBaseTestCase::ItemClick()
list->GetItemRect(0, pos); list->GetItemRect(0, pos);
//We move in slightly so we are not on the edge //We move in slightly so we are not on the edge
wxPoint point = list->ClientToScreen(pos.GetPosition()) + wxPoint(2, 2); wxPoint point = list->ClientToScreen(pos.GetPosition()) + wxPoint(10, 5);
sim.MouseMove(point); sim.MouseMove(point);
wxYield(); wxYield();
@@ -226,8 +222,15 @@ void ListBaseTestCase::ItemClick()
// when the first item was selected the focus changes to it, but not // when the first item was selected the focus changes to it, but not
// on subsequent clicks // on subsequent clicks
// FIXME: This test fail under wxGTK & wxOSX because we get 3 FOCUSED events and
// 2 SELECTED ones instead of the one of each we expect for some
// reason, this needs to be debugged as it may indicate a bug in the
// generic wxListCtrl implementation.
#ifndef _WX_GENERIC_LISTCTRL_H_
CPPUNIT_ASSERT_EQUAL(1, focused.GetCount()); CPPUNIT_ASSERT_EQUAL(1, focused.GetCount());
CPPUNIT_ASSERT_EQUAL(1, selected.GetCount()); CPPUNIT_ASSERT_EQUAL(1, selected.GetCount());
#endif
CPPUNIT_ASSERT_EQUAL(1, activated.GetCount()); CPPUNIT_ASSERT_EQUAL(1, activated.GetCount());
CPPUNIT_ASSERT_EQUAL(1, rclick.GetCount()); CPPUNIT_ASSERT_EQUAL(1, rclick.GetCount());