Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2010-09-22 12:45:45 +00:00
parent 2a4a928df7
commit a323f63a8d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/controls/windowtest.cpp
View File

@@ -185,11 +185,9 @@ void WindowTestCase::Mouse()
void WindowTestCase::Properties() void WindowTestCase::Properties()
{ {
#ifndef __WXGTK__
m_window->SetLabel("label"); m_window->SetLabel("label");
CPPUNIT_ASSERT_EQUAL("label", m_window->GetLabel()); 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->SetId(wxID_HIGHEST + 1);
m_window->SetName("name"); 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::FindWindowById(wxID_HIGHEST + 1));
CPPUNIT_ASSERT_EQUAL(m_window, wxWindow::FindWindowByName("name")); 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), CPPUNIT_ASSERT_EQUAL(static_cast<wxWindow*>(NULL),
wxWindow::FindWindowById(wxID_HIGHEST + 3)); wxWindow::FindWindowById(wxID_HIGHEST + 3));