check for NULL pointer in OnMeasureItem() as well as in OnDrawItem()

[wxWidgets.git] / src / mac / classic / bmpbuttn.cpp

diff --git a/src/mac/classic/bmpbuttn.cpp b/src/mac/classic/bmpbuttn.cpp
index f6ce4dd00c3779b42b9493566343856db820a056..b1bd49dff016b8483fa59b8d6ec6c20beeab63ac 100644 (file)
--- a/src/mac/classic/bmpbuttn.cpp
+++ b/src/mac/classic/bmpbuttn.cpp
@@ -70,7 +70,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
         kControlBehaviorOffsetContents + 
             ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
             kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
@@ -91,6 +91,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
     m_bmpNormal = bitmap;
+    InvalidateBestSize();
 
     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , m_bmpNormal ) ;