Reenable sorting tests for GTK

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

diff --git a/tests/controls/choicetest.cpp b/tests/controls/choicetest.cpp
index 846dc0d22938b104791a68544fc2e40f5a1ebe08..ecebee667cc2ee6b3dce4974b9037174dd99e2c4 100644 (file)
--- a/tests/controls/choicetest.cpp
+++ b/tests/controls/choicetest.cpp
@@ -64,7 +64,7 @@ void ChoiceTestCase::tearDown()
 
 void ChoiceTestCase::Sort()
 {
 
 void ChoiceTestCase::Sort()
 {

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

     wxDELETE(m_choice);
     m_choice = new wxChoice(wxTheApp->GetTopWindow(), wxID_ANY,
                             wxDefaultPosition, wxDefaultSize, 0, 0,
     wxDELETE(m_choice);
     m_choice = new wxChoice(wxTheApp->GetTopWindow(), wxID_ANY,
                             wxDefaultPosition, wxDefaultSize, 0, 0,

diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index 65e4161835126c8aa5ea0508c790128000cf7848..a8ed3827d28b246ce6082e969c6a5ec2b1a21039 100644 (file)
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -143,7 +143,7 @@ void ComboBoxTestCase::PopDismiss()
 
 void ComboBoxTestCase::Sort()
 {
 
 void ComboBoxTestCase::Sort()
 {

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

     m_combo = new wxComboBox(wxTheApp->GetTopWindow(), wxID_ANY, "",
                              wxDefaultPosition, wxDefaultSize, 0, NULL,
                              wxCB_SORT);
     m_combo = new wxComboBox(wxTheApp->GetTopWindow(), wxID_ANY, "",
                              wxDefaultPosition, wxDefaultSize, 0, NULL,
                              wxCB_SORT);

diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp
index 68ce0d7941344cde23fad77e21d3e7318b20f038..5718b47e42bd11025d78c8e83066e461e24019f7 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
         //run the wxITEM_CONTAINER_TESTS as they are tested with wxCheckListBox
 #ifdef __WXMSW__
         CPPUNIT_TEST( PseudoTest_OwnerDrawn );
         //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 );

-        CPPUNIT_TEST( Sort );

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