document that a valid image list is required for item dragging under MSW (see #4390)

[wxWidgets.git] / tests / controls / listctrltest.cpp

diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp
index e6bb46398637db69b6b6cb0c4e144ae87188b98b..fff36a4d7ad60258d1813911a9f66d9d2b56098d 100644 (file)
--- a/tests/controls/listctrltest.cpp
+++ b/tests/controls/listctrltest.cpp
@@ -83,12 +83,13 @@ void ListCtrlTestCase::tearDown()
 
 void ListCtrlTestCase::ColumnsOrder()
 {
-    static const int NUM_COLS;
     int n;
     wxListItem li;
     li.SetMask(wxLIST_MASK_TEXT);
 
     // first set up some columns
+    static const int NUM_COLS = 3;
+
     m_list->InsertColumn(0, "Column 0");
     m_list->InsertColumn(1, "Column 1");
     m_list->InsertColumn(2, "Column 2");
@@ -144,6 +145,8 @@ void ListCtrlTestCase::ColumnsOrder()
     CPPUNIT_ASSERT_EQUAL( "second in second", li.GetText() );
 }
 
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+
 void ListCtrlTestCase::ItemRect()
 {
     // set up for the test
@@ -157,7 +160,7 @@ void ListCtrlTestCase::ItemRect()
 
     // do test
     wxRect r;
-    CPPUNIT_ASSERT( !m_list->GetItemRect(1, r) );
+    WX_ASSERT_FAILS_WITH_ASSERT( m_list->GetItemRect(1, r) );
     CPPUNIT_ASSERT( m_list->GetItemRect(0, r) );
     CPPUNIT_ASSERT_EQUAL( 150, r.GetWidth() );
 
@@ -170,7 +173,6 @@ void ListCtrlTestCase::ItemRect()
     CPPUNIT_ASSERT( m_list->GetSubItemRect(0, 2, r) );
     CPPUNIT_ASSERT_EQUAL( 40, r.GetWidth() );
 
-    CPPUNIT_ASSERT( !m_list->GetSubItemRect(0, 3, r) );
+    WX_ASSERT_FAILS_WITH_ASSERT( m_list->GetSubItemRect(0, 3, r) );
 }
 
-#endif // wxHAS_LISTCTRL_COLUMN_ORDER