- m_windowId = id;
-
- if ( width == -1 && bitmap.Ok())
- width = bitmap.GetWidth() + 2*m_marginX;
-
- if ( height == -1 && bitmap.Ok())
- height = bitmap.GetHeight() + 2*m_marginY;
-
- 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 = ::NewControl( parent->MacGetRootWindow() , &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 )
- {
- 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 ;
- }
- }
-
- ::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
- MacPostControlCreate() ;
-
- return TRUE;
+ m_bmpNormal = bitmap;
+
+
+ if ( HasFlag( wxBORDER_NONE ) )
+ {
+ // contrary to the docs this control only works with iconrefs
+ wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
+ err = CreateIconControl(
+ MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+ &bounds, &info, false, m_peer->GetControlRefAddr() );
+ }
+ else
+ {
+ wxMacCreateBitmapButton( &info, m_bmpNormal );
+ err = CreateBevelButtonControl(
+ MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""),
+ ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ),
+ kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() );
+ }
+
+ verify_noerr( err );
+
+ wxMacReleaseBitmapButton( &info );
+ wxASSERT_MSG( m_peer != NULL && m_peer->Ok(), wxT("No valid native Mac control") );
+
+ MacPostControlCreate( pos, size );
+
+ return true;