X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..4e5a4c69c540b430fba8efe5dae1bc1ffd5caeca:/src/mac/bmpbuttn.cpp

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index dbbfc52d7a..de59d6db47 100644
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/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,42 +57,18 @@ 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( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
 		kControlBehaviorOffsetContents + 
 		    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
 	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+	wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
 	
 	ControlButtonContentInfo info ;
-	
-
-	if ( m_buttonBitmap.Ok() )
+	wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
+	if ( info.contentType != kControlNoContent )
 	{
-		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() ) ;
-			}
-			else
-			{
-				info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
-			}
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-		{
-	        info.contentType = kControlContentCIconHandle ;
-	        info.u.cIconHandle = bmap->m_hIcon ;
-		}
-	}
-	
-	UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
+	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
 	MacPostControlCreate() ;
 
     return TRUE;
@@ -100,36 +76,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
-	ControlButtonContentInfo info ;
     m_buttonBitmap = bitmap;
 
-	if ( m_buttonBitmap.Ok() )
+	ControlButtonContentInfo info ;
+	wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
+	if ( info.contentType != kControlNoContent )
 	{
-		wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-		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() ) ;
-			}
-			else
-			{
-				info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
-			}
-		}
-		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-		{
-	        info.contentType = kControlContentCIconHandle ;
-	        info.u.cIconHandle = bmap->m_hIcon ;
-		}
-		
-	    UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
 }