Simplify ButtonTestCase::Bitmap. The old test was not correct as it tested all bitmap...

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

diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp
index bb540b2cfc89800cf9ce41f400be9d5cade7a44b..64247d03f3c5fdb5abff453a7f1d8ef2b15cf27f 100644 (file)
--- a/tests/controls/buttontest.cpp
+++ b/tests/controls/buttontest.cpp
@@ -167,19 +167,15 @@ void ButtonTestCase::BitmapMargins()
 
 void ButtonTestCase::Bitmap()
 {
 
 void ButtonTestCase::Bitmap()
 {

-#if !defined(__WXGTK__) && !defined(__WXOSX__)

     //We start with no bitmaps
     CPPUNIT_ASSERT(!m_button->GetBitmap().IsOk());
 
     //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)));
 
                                                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
 }
 
 #endif //wxUSE_BUTTON