Setting eol-style property to CRLF for some project files.

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

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index fd4d1fa5bf61391f2be94d4e9bd9e3da4b264562..d22411f27ee8a54a7d5629035278874c583a033c 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -37,8 +37,8 @@ bool wxBitmapButton::Create( wxWindow *parent,
 {
     m_macIsUserPane = false;
 
-    if ( !wxControl::Create( parent, id, pos, size, style | wxBU_NOTEXT,
-                             validator, name ) )
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )
         return false;
 
     if ( style & wxBU_AUTODRAW )
@@ -61,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