X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d52a1abad31942f32364bb40808150c4be6c56cd..e86aa7a62cc8be79ffaeb0d07b70161cb9ea2c74:/src/osx/cocoa/toolbar.mm diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index 1a989ddd6c..f24970f53e 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -1244,9 +1244,6 @@ bool wxToolBar::Realize() SetInitialSize( wxSize(m_minWidth, m_minHeight)); SendSizeEventToParent(); - wxWindow * const parent = GetParent(); - if ( parent && !parent->IsBeingDeleted() ) - parent->MacOnInternalSize(); return true; } @@ -1465,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 )