X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/mac/bmpbuttn.cpp diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp index c143138609..de59d6db47 100644 --- a/src/mac/bmpbuttn.cpp +++ b/src/mac/bmpbuttn.cpp @@ -13,15 +13,15 @@ #pragma implementation "bmpbuttn.h" #endif +#include "wx/window.h" #include "wx/bmpbuttn.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #endif -#include - -PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ; +#include "wx/mac/uma.h" +#include "wx/bitmap.h" bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, @@ -52,39 +52,23 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit 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 + kControlContentPictHandle , 0, + m_macControl = ::NewControl( MAC_WXHWND(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" ) ; + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; - m_buttonBitmap = bitmap; - PicHandle icon = NULL ; - if ( m_buttonBitmap.Ok() ) - { - wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ; - if ( bmap->m_bitmapType == kMacBitmapTypePict ) - icon = bmap->m_hPict ; - else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld ) - { - if ( m_buttonBitmap.GetMask() ) - { - icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ; - } - else - { - icon = MakePict( bmap->m_hBitmap , NULL ) ; - } - } - } ControlButtonContentInfo info ; - - info.contentType = kControlContentPictHandle ; - info.u.picture = icon ; - - UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; - + wxMacCreateBitmapButton( &info , m_buttonBitmap ) ; + if ( info.contentType != kControlNoContent ) + { + ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; + } MacPostControlCreate() ; return TRUE; @@ -93,29 +77,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) { m_buttonBitmap = bitmap; - PicHandle icon = NULL ; - if ( m_buttonBitmap.Ok() ) - { - wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ; - if ( bmap->m_bitmapType == kMacBitmapTypePict ) - icon = bmap->m_hPict ; - else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld ) - { - if ( m_buttonBitmap.GetMask() ) - { - icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ; - } - else - { - icon = MakePict( bmap->m_hBitmap , NULL ) ; - } - } - } + ControlButtonContentInfo info ; - - info.contentType = kControlContentPictHandle ; - info.u.picture = icon ; - - UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; + wxMacCreateBitmapButton( &info , m_buttonBitmap ) ; + if ( info.contentType != kControlNoContent ) + { + ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; + } }