- 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 = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 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 ) ;
-
- MacPostControlCreate() ;
+ height = bitmap.GetHeight() + 2*m_marginY;
+
+ Rect bounds ;
+ Str255 title ;
+ m_bmpNormal = bitmap;
+ wxBitmapRefData * bmap = NULL ;
+
+ if ( m_bmpNormal.Ok() )
+ bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
+
+ MacPreControlCreate( parent , id , wxEmptyString , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
+
+ 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 , wxT("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() ;