From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 15 Jul 2013 01:32:03 +0000 (+0000)
Subject: Don't use images in wxToolBar with wxTB_NOICONS in wxOSX.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9031011cde34f9dfd59e40cf1c272f51020f7c38

Don't use images in wxToolBar with wxTB_NOICONS in wxOSX.

This results in asserts when adding items without bitmaps, but this should be
allowed when using wxTB_NOICONS.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index ed713512c8..f24970f53e 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -1462,7 +1462,8 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 #endif // wxOSX_USE_NATIVE_TOOLBAR
                 tool->SetControlHandle( controlHandle );
-                tool->UpdateImages();
+                if ( !(style & wxTB_NOICONS) )
+                    tool->UpdateImages();
                 tool->UpdateLabel();
 
                 if ( style & wxTB_NOICONS )