X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3778b4d9c7eebc39f496a9dd055638e06fb9140..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/tests/controls/checklistboxtest.cpp?ds=sidebyside diff --git a/tests/controls/checklistboxtest.cpp b/tests/controls/checklistboxtest.cpp index 9f2711ab30..eb3c9bf52f 100644 --- a/tests/controls/checklistboxtest.cpp +++ b/tests/controls/checklistboxtest.cpp @@ -65,11 +65,9 @@ void CheckListBoxTestCase::tearDown() void CheckListBoxTestCase::Check() { - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - - EventCounter count(m_check, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED); + EventCounter toggled(m_check, wxEVT_CHECKLISTBOX); + wxArrayInt checkedItems; wxArrayString testitems; testitems.Add("item 0"); testitems.Add("item 1"); @@ -83,10 +81,13 @@ void CheckListBoxTestCase::Check() m_check->Check(1, false); //We should not get any events when changing this from code - CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount()); + CPPUNIT_ASSERT_EQUAL(0, toggled.GetCount()); CPPUNIT_ASSERT_EQUAL(true, m_check->IsChecked(0)); CPPUNIT_ASSERT_EQUAL(false, m_check->IsChecked(1)); + CPPUNIT_ASSERT_EQUAL(1, m_check->GetCheckedItems(checkedItems)); + CPPUNIT_ASSERT_EQUAL(0, checkedItems[0]); + //Make sure a double check of an items doesn't deselect it m_check->Check(0);