From: Robert Roebling <robert@roebling.de>
Date: Tue, 24 Aug 2010 17:22:12 +0000 (+0000)
Subject: Reenable sorting tests for GTK
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a6856aa899706c5fef9dd4c10bfaac66f9114195

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 846dc0d229..ecebee667c 100644
--- a/tests/controls/choicetest.cpp
+++ b/tests/controls/choicetest.cpp
@@ -64,7 +64,7 @@ void ChoiceTestCase::tearDown()
 
 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,
diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index 65e4161835..a8ed3827d2 100644
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -143,7 +143,7 @@ void ComboBoxTestCase::PopDismiss()
 
 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);
diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp
index 68ce0d7941..5718b47e42 100644
--- a/tests/controls/listboxtest.cpp
+++ b/tests/controls/listboxtest.cpp
@@ -43,11 +43,11 @@ private:
         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 );
-        CPPUNIT_TEST( Sort );
         CPPUNIT_TEST( MultipleSelect );
         WXUISIM_TEST( ClickEvents );
         WXUISIM_TEST( ClickNotOnItem );