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
This commit is contained in:
@@ -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 )
|
||||
|
Reference in New Issue
Block a user