X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..bf60426831535738b1b784629f08e9dd00bf9ecc:/src/mac/carbon/bmpbuttn.cpp

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 169f0d557a..7f89c97abd 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -13,31 +13,29 @@
 #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"
+#include "wx/bitmap.h"
+
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            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_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,14 +50,43 @@ 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_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 ) ;
 
-    return FALSE;
+	m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
+		kControlBehaviorOffsetContents + 
+		    ( 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 ;
+	wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+	if ( info.contentType != kControlNoContent )
+	{
+	    ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
+	MacPostControlCreate() ;
+
+    return TRUE;
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;
+
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+    if ( info.contentType != kControlNoContent )
+    {
+        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
 }