From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Sun, 5 Sep 2010 13:31:13 +0000 (+0000)
Subject: Simplify ButtonTestCase::Bitmap. The old test was not correct as it tested all bitmap... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d377e9fe754e638f326a6885d7907910c77019e0?hp=6e269b25f0956d1bc9b8e4a26453dd5989fb7a90

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.

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 bb540b2cfc..64247d03f3 100644
--- a/tests/controls/buttontest.cpp
+++ b/tests/controls/buttontest.cpp
@@ -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