X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4868bfb17e1c8c9174fb4a6e29b601f0f0f7fa01..16671f229af4d3ff3ca2a6612a8ebc6c89f45c24:/src/osx/bmpbuttn_osx.cpp diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp index fd4d1fa5bf..9a1cb174ca 100644 --- a/src/osx/bmpbuttn_osx.cpp +++ b/src/osx/bmpbuttn_osx.cpp @@ -22,6 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) + #include "wx/osx/private.h" //--------------------------------------------------------------------------- @@ -37,8 +38,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,13 +62,6 @@ bool wxBitmapButton::Create( wxWindow *parent, return true; } -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - InvalidateBestSize(); - - m_peer->SetBitmap( bitmap ); -} - wxSize wxBitmapButton::DoGetBestSize() const { wxSize best(m_marginX, m_marginY);