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

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index 169f0d557a..3b4a0a5d85 100644
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -13,12 +13,17 @@
 #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 ) ;
+
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,
@@ -26,13 +31,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxString& name)
 {
     m_buttonBitmap = bitmap;
-    SetName(name);
-    SetValidator(validator);
-    parent->AddChild(this);
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-    m_windowStyle = style;
+ 
     m_marginX = 0;
     m_marginY = 0;
 
@@ -52,14 +51,86 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     if ( height == -1 && bitmap.Ok())
 	height = bitmap.GetHeight() + 2*m_marginY;
 
-    /* TODO: create bitmap button
-     */
+	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 , 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" ) ;
+	
+	ControlButtonContentInfo info ;
+	
+
+	if ( m_buttonBitmap.Ok() )
+	{
+		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 ) ;
 
-    return FALSE;
+	MacPostControlCreate() ;
+
+    return TRUE;
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
+	ControlButtonContentInfo info ;
     m_buttonBitmap = 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 ;
+		}
+		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 ) ;
+    }
 }