X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be2958285a158420c7268554b9ad587952926199..bf60426831535738b1b784629f08e9dd00bf9ecc:/src/mac/carbon/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index de59d6db47..7f89c97abd 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -29,13 +29,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxValidator& validator,
            const wxString& name)
 {
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;
  
     m_marginX = 0;
     m_marginY = 0;
 
-    int x = pos.x;
-    int y = pos.y;
+    // int x = pos.x;
+    // int y = pos.y;
     int width = size.x;
     int height = size.y;
 
@@ -52,19 +52,23 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 	Rect bounds ;
 	Str255 title ;
-    m_buttonBitmap = bitmap;
-	wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+    m_bmpNormal = bitmap;
+	wxBitmapRefData * bmap = NULL ;
+	
+	if ( m_bmpNormal.Ok() )
+		bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
 	
 	MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
 	m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
 		kControlBehaviorOffsetContents + 
-		    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
+		    ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
+		    kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
 	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
 	wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
 	
 	ControlButtonContentInfo info ;
-	wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
+	wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
 	if ( info.contentType != kControlNoContent )
 	{
 	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
@@ -76,13 +80,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;
 
-	ControlButtonContentInfo info ;
-	wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
-	if ( info.contentType != kControlNoContent )
-	{
-	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+    if ( info.contentType != kControlNoContent )
+    {
+        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
 }