diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp index 6d0b9f1a47..a71aa0e1c6 100644 --- a/tests/controls/listboxtest.cpp +++ b/tests/controls/listboxtest.cpp @@ -109,26 +109,26 @@ void ListBoxTestCase::Sort() m_list->Append(testitems); -#ifndef __WXQT__ - CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(0)); - CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1)); - CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(2)); - CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3)); - CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4)); - CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5)); -#else +#if defined(__WXQT__) && defined(__WINDOWS__) CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(0)); CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1)); CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(2)); CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3)); CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4)); CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5)); -#endif m_list->Append("a", wxUIntToPtr(1)); CPPUNIT_ASSERT_EQUAL("a", m_list->GetString(0)); CPPUNIT_ASSERT_EQUAL(wxUIntToPtr(1), m_list->GetClientData(0)); +#else + CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(0)); + CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1)); + CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(2)); + CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3)); + CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4)); + CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5)); +#endif #endif }