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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index dbbfc52d7a..2a93999107 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -13,15 +13,15 @@
 #pragma implementation "bmpbuttn.h"
 #endif
 
+#include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
-#include <wx/mac/uma.h>
-
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+#include "wx/mac/uma.h"
+#include "wx/bitmap.h"
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
@@ -57,7 +57,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 	
 	MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 
+	m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 
 		kControlBehaviorOffsetContents + 
 		    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
 	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
@@ -69,19 +69,22 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 	if ( m_buttonBitmap.Ok() )
 	{
 		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-	        info.contentType = kControlContentPictHandle ;
-	        info.u.picture = bmap->m_hPict ;
+	    info.contentType = kControlContentPictHandle ;
+			info.u.picture = bmap->m_hPict ;
 		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
 		{
-	        info.contentType = kControlContentPictHandle ;
 			if ( m_buttonBitmap.GetMask() )
 			{
-				info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+				    8 , 16 ) ;
 			}
 			else
 			{
-				info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+				    8 , 16 ) ;
 			}
 		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
@@ -91,7 +94,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 		}
 	}
 	
-	UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+	::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
 
 	MacPostControlCreate() ;
 
@@ -106,21 +109,23 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 	if ( m_buttonBitmap.Ok() )
 	{
 		wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-		if ( bmap->m_bitmapType == kMacBitmapTypePict )
-		{
-	        info.contentType = kControlContentPictHandle ;
-	        info.u.picture = bmap->m_hPict ;
+		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+	    info.contentType = kControlContentPictHandle ;
+			info.u.picture = bmap->m_hPict ;
 		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
 		{
-	        info.contentType = kControlContentPictHandle ;
 			if ( m_buttonBitmap.GetMask() )
 			{
-				info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+				    8 , 16 ) ;
 			}
 			else
 			{
-				info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+				    8 , 16 ) ;
 			}
 		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
@@ -128,8 +133,9 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 	        info.contentType = kControlContentCIconHandle ;
 	        info.u.cIconHandle = bmap->m_hIcon ;
 		}
+
 		
-	    UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+	    ::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
 }