Move the second wxListBox sort test back to the ownerdrawn section and re-enable...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp
index 5718b47e42bd11025d78c8e83066e461e24019f7..6c3419c65cf26d38359dc47f9a7da55260dd9ada 100644 (file)
--- a/tests/controls/listboxtest.cpp
+++ b/tests/controls/listboxtest.cpp
@@ -43,11 +43,11 @@ private:
         WXUISIM_TEST( ClickEvents );
         WXUISIM_TEST( ClickNotOnItem );
         CPPUNIT_TEST( HitTest );
         WXUISIM_TEST( ClickEvents );
         WXUISIM_TEST( ClickNotOnItem );
         CPPUNIT_TEST( HitTest );

-        CPPUNIT_TEST( Sort );
-        //We also run all tests as an ownerdrawn list box we do not need to
+        //We also run all tests as an ownerdrawn list box.  We do not need to

         //run the wxITEM_CONTAINER_TESTS as they are tested with wxCheckListBox
 #ifdef __WXMSW__
         CPPUNIT_TEST( PseudoTest_OwnerDrawn );
         //run the wxITEM_CONTAINER_TESTS as they are tested with wxCheckListBox
 #ifdef __WXMSW__
         CPPUNIT_TEST( PseudoTest_OwnerDrawn );

+        CPPUNIT_TEST( Sort );

         CPPUNIT_TEST( MultipleSelect );
         WXUISIM_TEST( ClickEvents );
         WXUISIM_TEST( ClickNotOnItem );
         CPPUNIT_TEST( MultipleSelect );
         WXUISIM_TEST( ClickEvents );
         WXUISIM_TEST( ClickNotOnItem );


@@ -100,7 +100,7 @@ void ListBoxTestCase::tearDown()
 
 void ListBoxTestCase::Sort()
 {
 
 void ListBoxTestCase::Sort()
 {

-#if !defined(__WXGTK__) && !defined(__WXOSX__)
+#ifndef(__WXOSX__)

     wxDELETE(m_list);
     m_list = new wxListBox(wxTheApp->GetTopWindow(), wxID_ANY,
                             wxDefaultPosition, wxDefaultSize, 0, 0,
     wxDELETE(m_list);
     m_list = new wxListBox(wxTheApp->GetTopWindow(), wxID_ANY,
                             wxDefaultPosition, wxDefaultSize, 0, 0,