Draw wxAuiToolbar button text even if it has no bitmap.

Don't skip drawing the button label if it doesn't have any bitmap.

Closes #10303.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-05-14 14:17:59 +00:00
parent cb542c4046
commit 2347971e99

View File

@@ -362,10 +362,8 @@ void wxAuiDefaultToolBarArt::DrawButton(
else
bmp = item.GetBitmap();
if (!bmp.IsOk())
return;
dc.DrawBitmap(bmp, bmp_x, bmp_y, true);
if ( bmp.IsOk() )
dc.DrawBitmap(bmp, bmp_x, bmp_y, true);
// set the item's text color based on if it is disabled
dc.SetTextForeground(*wxBLACK);