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

Fix tests compilation with wxUSE_TOOLTIPS==0 as in wxX11.

Browse Source 
Unit test suite didn't compile in wxX11 build because it doesn't support
tooltips, just disable the relevant test then.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-10-04 10:41:39 +00:00
parent f5b7586bfe
commit fa38073670
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/controls/windowtest.cpp
View File

@ -41,7 +41,9 @@ private:
CPPUNIT_TEST( FocusEvent ); CPPUNIT_TEST( FocusEvent );
CPPUNIT_TEST( Mouse ); CPPUNIT_TEST( Mouse );
CPPUNIT_TEST( Properties ); CPPUNIT_TEST( Properties );
#if wxUSE_TOOLTIPS
CPPUNIT_TEST( ToolTip ); CPPUNIT_TEST( ToolTip );
#endif // wxUSE_TOOLTIPS
CPPUNIT_TEST( Help ); CPPUNIT_TEST( Help );
CPPUNIT_TEST( Parent ); CPPUNIT_TEST( Parent );
CPPUNIT_TEST( Siblings ); CPPUNIT_TEST( Siblings );
@ -58,7 +60,9 @@ private:
void FocusEvent(); void FocusEvent();
void Mouse(); void Mouse();
void Properties(); void Properties();
#if wxUSE_TOOLTIPS
void ToolTip(); void ToolTip();
#endif // wxUSE_TOOLTIPS
void Help(); void Help();
void Parent(); void Parent();
void Siblings(); void Siblings();
@ -201,6 +205,7 @@ void WindowTestCase::Properties()
CPPUNIT_ASSERT_EQUAL(wxID_HIGHEST + 10, m_window->GetId()); CPPUNIT_ASSERT_EQUAL(wxID_HIGHEST + 10, m_window->GetId());
} }
#if wxUSE_TOOLTIPS
void WindowTestCase::ToolTip() void WindowTestCase::ToolTip()
{ {
CPPUNIT_ASSERT(!m_window->GetToolTip()); CPPUNIT_ASSERT(!m_window->GetToolTip());
@ -222,6 +227,7 @@ void WindowTestCase::ToolTip()
CPPUNIT_ASSERT_EQUAL(tip, m_window->GetToolTip()); CPPUNIT_ASSERT_EQUAL(tip, m_window->GetToolTip());
CPPUNIT_ASSERT_EQUAL("other tip", m_window->GetToolTipText()); CPPUNIT_ASSERT_EQUAL("other tip", m_window->GetToolTipText());
} }
#endif // wxUSE_TOOLTIPS
void WindowTestCase::Help() void WindowTestCase::Help()
{ {