From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 14 May 2011 14:17:59 +0000 (+0000)
Subject: Draw wxAuiToolbar button text even if it has no bitmap.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2347971e99beec64d98d3808b75e280995de675f?ds=inline

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
---

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index cb1903a287..b79323d664 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -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);