suppress more float/double->int conversion warnings to be able to see anything else...

[wxWidgets.git] / src / osx / bmpbuttn_osx.cpp

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index f4c76447f4bb9f6bd69e55d923f9298878e5b99e..c79f4fd47c51582e1ffe61d869bb1c59f5539bc4 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -37,7 +37,8 @@ bool wxBitmapButton::Create( wxWindow *parent,
 {
     m_macIsUserPane = false;
 
-    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+    if ( !wxControl::Create( parent, id, pos, size, style | wxBU_NOTEXT,
+                             validator, name ) )
         return false;
 
     if ( style & wxBU_AUTODRAW )
@@ -60,11 +61,15 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
+void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 {
-    InvalidateBestSize();
+    wxBitmapButtonBase::DoSetBitmap(bitmap, which);
 
-    m_peer->SetBitmap( bitmap );
+    // we don't support any other states currently
+    if ( which == State_Normal )
+    {
+        m_peer->SetBitmap( bitmap );
+    }
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const