Use kControlContentIconRef when recreating the tool for toggled state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -453,7 +453,7 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
|
|||||||
dc.DrawBitmap( m_bmpNormal, 0, 0, true );
|
dc.DrawBitmap( m_bmpNormal, 0, 0, true );
|
||||||
dc.SelectObject( wxNullBitmap );
|
dc.SelectObject( wxNullBitmap );
|
||||||
ControlButtonContentInfo info;
|
ControlButtonContentInfo info;
|
||||||
wxMacCreateBitmapButton( &info, bmp );
|
wxMacCreateBitmapButton( &info, bmp, kControlContentIconRef );
|
||||||
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
|
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
|
||||||
#if wxMAC_USE_NATIVE_TOOLBAR
|
#if wxMAC_USE_NATIVE_TOOLBAR
|
||||||
if (m_toolbarItemRef != NULL)
|
if (m_toolbarItemRef != NULL)
|
||||||
@@ -466,7 +466,7 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
ControlButtonContentInfo info;
|
ControlButtonContentInfo info;
|
||||||
wxMacCreateBitmapButton( &info, m_bmpNormal );
|
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
|
||||||
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
|
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
|
||||||
#if wxMAC_USE_NATIVE_TOOLBAR
|
#if wxMAC_USE_NATIVE_TOOLBAR
|
||||||
if (m_toolbarItemRef != NULL)
|
if (m_toolbarItemRef != NULL)
|
||||||
|
Reference in New Issue
Block a user