merge error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@67130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -487,7 +487,6 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
|
||||
dc.DrawRoundedRectangle( 0, 0, w, h, 1.5 );
|
||||
dc.DrawBitmap( m_bmpNormal, 3, 3, true );
|
||||
|
||||
dc.DrawBitmap( m_bmpNormal, 0, 0, true );
|
||||
dc.SelectObject( wxNullBitmap );
|
||||
ControlButtonContentInfo info;
|
||||
wxMacCreateBitmapButton( &info, bmp, kControlContentIconRef);
|
||||
|
Reference in New Issue
Block a user