X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b38dc31ffa6eb372727a7b0e65001a1c3d107fcb..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/osx/bmpbuttn_osx.cpp?ds=sidebyside diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp index 9a1cb174ca..a2c2eadfee 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,9 +20,6 @@ #include "wx/dcmemory.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) - - #include "wx/osx/private.h" //--------------------------------------------------------------------------- @@ -36,8 +33,8 @@ bool wxBitmapButton::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_macIsUserPane = false; - + DontCreatePeer(); + if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style, validator, name) ) return false; @@ -55,7 +52,7 @@ bool wxBitmapButton::Create( wxWindow *parent, m_bitmaps[State_Normal] = bitmap; - m_peer = wxWidgetImpl::CreateBitmapButton( this, parent, id, bitmap, pos, size, style, GetExtraStyle() ); + SetPeer(wxWidgetImpl::CreateBitmapButton( this, parent, id, bitmap, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size );