Remove an assert that was not backed up by the documentation and so failed on some platforms but not on others. Re-enable some tests that were disabled in wxGTK as they now pass.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -238,7 +238,7 @@ void GridTestCase::CellSelect()
|
|||||||
|
|
||||||
void GridTestCase::LabelClick()
|
void GridTestCase::LabelClick()
|
||||||
{
|
{
|
||||||
#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__)
|
#if wxUSE_UIACTIONSIMULATOR
|
||||||
wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
|
wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
|
||||||
wxTestableFrame);
|
wxTestableFrame);
|
||||||
|
|
||||||
@@ -263,9 +263,6 @@ void GridTestCase::LabelClick()
|
|||||||
sim.MouseDblClick();
|
sim.MouseDblClick();
|
||||||
wxYield();
|
wxYield();
|
||||||
|
|
||||||
//A double click event sends a single click event first
|
|
||||||
//test to ensure this still happens in the future
|
|
||||||
CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_GRID_LABEL_LEFT_CLICK));
|
|
||||||
CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_GRID_LABEL_LEFT_DCLICK));
|
CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_GRID_LABEL_LEFT_DCLICK));
|
||||||
|
|
||||||
sim.MouseClick(wxMOUSE_BTN_RIGHT);
|
sim.MouseClick(wxMOUSE_BTN_RIGHT);
|
||||||
@@ -292,7 +289,7 @@ void GridTestCase::LabelClick()
|
|||||||
|
|
||||||
void GridTestCase::SortClick()
|
void GridTestCase::SortClick()
|
||||||
{
|
{
|
||||||
#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__)
|
#if wxUSE_UIACTIONSIMULATOR
|
||||||
m_grid->SetSortingColumn(0);
|
m_grid->SetSortingColumn(0);
|
||||||
|
|
||||||
wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
|
wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
|
||||||
@@ -312,8 +309,6 @@ void GridTestCase::SortClick()
|
|||||||
wxYield();
|
wxYield();
|
||||||
|
|
||||||
CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount());
|
CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount());
|
||||||
|
|
||||||
m_grid->SetSortingColumn(wxNOT_FOUND);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user