X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..7379599933e8db2dc319bd5240b4992687db4e46:/src/mac/carbon/bmpbuttn.cpp

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index ed8ee2a469..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,50 +52,27 @@ 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 ;
-	
-
-	if ( m_buttonBitmap.Ok() )
+	wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+	if ( info.contentType != kControlNoContent )
 	{
-		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-	    info.contentType = kControlContentPictHandle ;
-			info.u.picture = MAC_WXHMETAFILE( bmap->m_hPict ) ;
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-		{
-			if ( m_buttonBitmap.GetMask() )
-			{
-		    info.contentType = kControlContentCIconHandle ;
-				info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
-				    8 , 16 ) ;
-			}
-			else
-			{
-		    info.contentType = kControlContentCIconHandle ;
-				info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , NULL ,
-				    8 , 16 ) ;
-			}
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-		{
-	        info.contentType = kControlContentCIconHandle ;
-	        info.u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
-		}
-	}
-	
-	::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
+	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
 	MacPostControlCreate() ;
 
     return TRUE;
@@ -103,39 +80,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
-	ControlButtonContentInfo info ;
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;
 
-	if ( m_buttonBitmap.Ok() )
-	{
-		wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-	    info.contentType = kControlContentPictHandle ;
-			info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-		{
-			if ( m_buttonBitmap.GetMask() )
-			{
-		    info.contentType = kControlContentCIconHandle ;
-				info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
-				    8 , 16 ) ;
-			}
-			else
-			{
-		    info.contentType = kControlContentCIconHandle ;
-				info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
-				    8 , 16 ) ;
-			}
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-		{
-	        info.contentType = kControlContentCIconHandle ;
-	        info.u.cIconHandle = MAC_WXHICON( bmap->m_hIcon ) ;
-		}
-
-		
-	    ::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 ) ;
     }
 }