Re-enable disabled wxWindow label tests under wxGTK as they were fixed in r65374

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

diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp
index 72266b2753d60bd4733a5b932a1243469e7db661..971160269e47cb3951e6918c75c231b67c47a29a 100644 (file)
--- a/tests/controls/windowtest.cpp
+++ b/tests/controls/windowtest.cpp
@@ -185,11 +185,9 @@ void WindowTestCase::Mouse()
 
 void WindowTestCase::Properties()
 {
 
 void WindowTestCase::Properties()
 {

-#ifndef __WXGTK__

     m_window->SetLabel("label");
 
     CPPUNIT_ASSERT_EQUAL("label", m_window->GetLabel());
     m_window->SetLabel("label");
 
     CPPUNIT_ASSERT_EQUAL("label", m_window->GetLabel());

-#endif

 
     m_window->SetName("name");
 
 
     m_window->SetName("name");
 


@@ -370,15 +368,11 @@ void WindowTestCase::FindWindowBy()
 {
     m_window->SetId(wxID_HIGHEST + 1);
     m_window->SetName("name");
 {
     m_window->SetId(wxID_HIGHEST + 1);
     m_window->SetName("name");

-#ifndef __WXGTK__

     m_window->SetLabel("label");
     m_window->SetLabel("label");

-#endif

 
     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowById(wxID_HIGHEST + 1));
     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByName("name"));
 
     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowById(wxID_HIGHEST + 1));
     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByName("name"));

-#ifndef __WXGTK__

     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByLabel("label"));
     CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByLabel("label"));

-#endif

 
     CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL),
                          wxWindow::FindWindowById(wxID_HIGHEST + 3));
 
     CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL),
                          wxWindow::FindWindowById(wxID_HIGHEST + 3));