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

Simplify ButtonTestCase::Bitmap. The old test was not correct as it tested all bitmaps to see if they were valid, however these do not get set by SetBitmap and so the tests only passed if the platform set valid defaults.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton 2010-09-05 13:31:13 +00:00
parent 6e269b25f0
commit d377e9fe75
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/controls/buttontest.cpp
View File

@ -167,19 +167,15 @@ void ButtonTestCase::BitmapMargins()
void ButtonTestCase::Bitmap()
{
#if !defined(__WXGTK__) && !defined(__WXOSX__)
//We start with no bitmaps
CPPUNIT_ASSERT(!m_button->GetBitmap().IsOk());
//Set bitmap should set a bitmap for all states
m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER,
m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION,
wxART_OTHER,
wxSize(32, 32)));
CPPUNIT_ASSERT(m_button->GetBitmapDisabled().IsOk());
CPPUNIT_ASSERT(m_button->GetBitmapPressed().IsOk());
CPPUNIT_ASSERT(m_button->GetBitmapCurrent().IsOk());
CPPUNIT_ASSERT(m_button->GetBitmapFocus().IsOk());
#endif
CPPUNIT_ASSERT(m_button->GetBitmap().IsOk());
}
#endif //wxUSE_BUTTON