adding CGImageRef support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -110,7 +110,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
|
|||||||
#ifdef __WXMAC_OSX__
|
#ifdef __WXMAC_OSX__
|
||||||
if ( HasFlag( wxBORDER_NONE ) )
|
if ( HasFlag( wxBORDER_NONE ) )
|
||||||
{
|
{
|
||||||
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
|
wxMacCreateBitmapButton( &info, m_bmpNormal );
|
||||||
err = CreateIconControl(
|
err = CreateIconControl(
|
||||||
MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
|
MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
|
||||||
&bounds, &info, false, m_peer->GetControlRefAddr() );
|
&bounds, &info, false, m_peer->GetControlRefAddr() );
|
||||||
@@ -145,7 +145,7 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
|
|||||||
#ifdef __WXMAC_OSX__
|
#ifdef __WXMAC_OSX__
|
||||||
if ( HasFlag( wxBORDER_NONE ) )
|
if ( HasFlag( wxBORDER_NONE ) )
|
||||||
{
|
{
|
||||||
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
|
wxMacCreateBitmapButton( &info, m_bmpNormal );
|
||||||
if ( info.contentType != kControlNoContent )
|
if ( info.contentType != kControlNoContent )
|
||||||
m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
|
m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user