X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09219654cd18705e833f93e888b347ab6d1b8494..f313deaa38ebd9d8a9a2755a105e12999dd5493c:/src/osx/bmpbuttn_osx.cpp diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp index c79f4fd47c..4e872a906e 100644 --- a/src/osx/bmpbuttn_osx.cpp +++ b/src/osx/bmpbuttn_osx.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: bmpbuttn.cpp 54820 2008-07-29 20:04:11Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,8 +20,6 @@ #include "wx/dcmemory.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) - #include "wx/osx/private.h" //--------------------------------------------------------------------------- @@ -37,8 +35,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,17 +59,6 @@ bool wxBitmapButton::Create( wxWindow *parent, return true; } -void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - wxBitmapButtonBase::DoSetBitmap(bitmap, which); - - // we don't support any other states currently - if ( which == State_Normal ) - { - m_peer->SetBitmap( bitmap ); - } -} - wxSize wxBitmapButton::DoGetBestSize() const { wxSize best(m_marginX, m_marginY);