X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37e2cb08cd1910ec5a14b38f0addfc6e2e8e172e..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/mac/bmpbuttn.cpp

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index f435ab2b32..c1a5949c9d 100644
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -13,13 +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) ;
+#include "wx/mac/uma.h"
+#include "wx/bitmap.h"
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
@@ -48,35 +50,51 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     if ( height == -1 && bitmap.Ok())
 	height = bitmap.GetHeight() + 2*m_marginY;
 
-	m_macHorizontalBorder = 2 ; // additional pixels around the real control
-	m_macVerticalBorder = 2 ;
 	Rect bounds ;
 	Str255 title ;
+    m_buttonBitmap = bitmap;
+	wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+	
 	MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 
-		kControlBehaviorOffsetContents + kControlContentPictHandle , 0, 
+	m_macControl = ::NewControl( parent->GetMacRootWindow() , &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" ) ;
 	
-    m_buttonBitmap = bitmap;
-			PicHandle	icon = NULL ;
+	ControlButtonContentInfo info ;
+	
+
 	if ( m_buttonBitmap.Ok() )
 	{
-		wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-		if ( bmap->m_bitmapType == kMacBitmapTypePict )
-			icon = bmap->m_hPict ;
+		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+	    info.contentType = kControlContentPictHandle ;
+			info.u.picture = bmap->m_hPict ;
+		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
 		{
-			icon = MakePict( bmap->m_hBitmap ) ;
+			if ( m_buttonBitmap.GetMask() )
+			{
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+				    8 , 16 ) ;
+			}
+			else
+			{
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+				    8 , 16 ) ;
+			}
+		}
+		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+		{
+	        info.contentType = kControlContentCIconHandle ;
+	        info.u.cIconHandle = bmap->m_hIcon ;
 		}
 	}
-	ControlButtonContentInfo info ;
-	
-	info.contentType = kControlContentPictHandle ;
-	info.u.picture = icon ;
 	
-	UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+	::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
 
 	MacPostControlCreate() ;
 
@@ -85,23 +103,39 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
+	ControlButtonContentInfo info ;
     m_buttonBitmap = bitmap;
-			PicHandle	icon = NULL ;
+
 	if ( m_buttonBitmap.Ok() )
 	{
 		wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-		if ( bmap->m_bitmapType == kMacBitmapTypePict )
-			icon = bmap->m_hPict ;
+		if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+	    info.contentType = kControlContentPictHandle ;
+			info.u.picture = bmap->m_hPict ;
+		}
 		else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
 		{
-			icon = MakePict( bmap->m_hBitmap ) ;
+			if ( m_buttonBitmap.GetMask() )
+			{
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+				    8 , 16 ) ;
+			}
+			else
+			{
+		    info.contentType = kControlContentCIconHandle ;
+				info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+				    8 , 16 ) ;
+			}
 		}
-	}
-	ControlButtonContentInfo info ;
-	
-	info.contentType = kControlContentPictHandle ;
-	info.u.picture = icon ;
-	
-	UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+		else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+		{
+	        info.contentType = kControlContentCIconHandle ;
+	        info.u.cIconHandle = bmap->m_hIcon ;
+		}
+
+		
+	    ::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
 }