X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/232fdc630c42eb165f7659981043e794be03b3b7..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/tests/controls/listctrltest.cpp

diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp
index cb61633002..dfd3784d22 100644
--- a/tests/controls/listctrltest.cpp
+++ b/tests/controls/listctrltest.cpp
@@ -46,10 +46,12 @@ public:
 private:
     CPPUNIT_TEST_SUITE( ListCtrlTestCase );
         wxLIST_BASE_TESTS();
+        CPPUNIT_TEST( EditLabel );
         WXUISIM_TEST( ColumnClick );
         WXUISIM_TEST( ColumnDrag );
     CPPUNIT_TEST_SUITE_END();
 
+    void EditLabel();
 #if wxUSE_UIACTIONSIMULATOR
     // Column events are only supported in wxListCtrl currently so we test them
     // here rather than in ListBaseTest
@@ -65,7 +67,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ListCtrlTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ListCtrlTestCase, "ListCtrlTestCase" );
 
 // ----------------------------------------------------------------------------
@@ -85,15 +87,19 @@ void ListCtrlTestCase::tearDown()
     m_list = NULL;
 }
 
+void ListCtrlTestCase::EditLabel()
+{
+    m_list->InsertColumn(0, "Column 0");
+    m_list->InsertItem(0, "foo");
+    m_list->EditLabel(0);
+}
+
 #if wxUSE_UIACTIONSIMULATOR
 void ListCtrlTestCase::ColumnDrag()
 {
-   wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_list, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG);
-    EventCounter count1(m_list, wxEVT_COMMAND_LIST_COL_DRAGGING);
-    EventCounter count2(m_list, wxEVT_COMMAND_LIST_COL_END_DRAG);
+    EventCounter begindrag(m_list, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG);
+    EventCounter dragging(m_list, wxEVT_COMMAND_LIST_COL_DRAGGING);
+    EventCounter enddrag(m_list, wxEVT_COMMAND_LIST_COL_END_DRAG);
 
     m_list->InsertColumn(0, "Column 0");
     m_list->InsertColumn(1, "Column 1");
@@ -117,20 +123,17 @@ void ListCtrlTestCase::ColumnDrag()
     sim.MouseUp();
     wxYield();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG));
-    CPPUNIT_ASSERT(frame->GetEventCount(wxEVT_COMMAND_LIST_COL_DRAGGING) > 0);
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_LIST_COL_END_DRAG));
+    CPPUNIT_ASSERT_EQUAL(1, begindrag.GetCount());
+    CPPUNIT_ASSERT(dragging.GetCount() > 0);
+    CPPUNIT_ASSERT_EQUAL(1, enddrag.GetCount());
 
     m_list->ClearAll();
 }
 
 void ListCtrlTestCase::ColumnClick()
 {
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_list, wxEVT_COMMAND_LIST_COL_CLICK);
-    EventCounter count1(m_list, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK);
+    EventCounter colclick(m_list, wxEVT_COMMAND_LIST_COL_CLICK);
+    EventCounter colrclick(m_list, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK);
 
 
     m_list->InsertColumn(0, "Column 0", wxLIST_FORMAT_LEFT, 60);
@@ -144,8 +147,8 @@ void ListCtrlTestCase::ColumnClick()
     sim.MouseClick(wxMOUSE_BTN_RIGHT);
     wxYield();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_LIST_COL_CLICK));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK));
+    CPPUNIT_ASSERT_EQUAL(1, colclick.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, colrclick.GetCount());
 
     m_list->ClearAll();
 }