X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dec57adfdb2469b7679930092f0bd9c8569d62c..2fb4d7b86e82851bafd4620418e0e404fc801f1c:/src/mac/carbon/bmpbuttn.cpp diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 95dfb80ad4..d63ddcb227 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -13,13 +13,14 @@ #pragma implementation "bmpbuttn.h" #endif +#include "wx/window.h" #include "wx/bmpbuttn.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #endif -#include +#include "wx/mac/uma.h" PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ; @@ -57,7 +58,7 @@ 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 , true , 0 , + m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , kControlBehaviorOffsetContents + ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;