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

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index fecc971add..569a2cd338 100644
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/bmpbuttn.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
 
 #include <wx/mac/uma.h>
 
@@ -50,15 +48,15 @@ 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 ;
+	m_macHorizontalBorder = 0 ; // additional pixels around the real control
+	m_macVerticalBorder = 0 ;
 	Rect bounds ;
 	Str255 title ;
 	MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
 	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 
 		kControlBehaviorOffsetContents + kControlContentPictHandle , 0, 
-	  	kControlBevelButtonNormalBevelProc , (long) this ) ;
+	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 	
     m_buttonBitmap = bitmap;