using statically allocated font objects for speedup

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

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index fd4d1fa5bf61391f2be94d4e9bd9e3da4b264562..9a1cb174ca5baece3f52794d81c237058335a737 100644 (file)
--- 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);