Don't use m_macToolbar in wxOSX wxToolBar if it is NULL.
This fixes a crash when a native toolbar is not used by wxToolBar as it happens when it's used by wxToolbook for example. Closes #11775. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -927,6 +927,11 @@ bool wxToolBar::Create(
|
||||
wxToolBar::~wxToolBar()
|
||||
{
|
||||
#if wxOSX_USE_NATIVE_TOOLBAR
|
||||
// We could be not using a native tool bar at all, this happens when we're
|
||||
// created with something other than the frame as parent for example.
|
||||
if ( !m_macToolbar )
|
||||
return;
|
||||
|
||||
CFIndex count = CFGetRetainCount( m_macToolbar ) ;
|
||||
// Leopard seems to have one refcount more, so we cannot check reliably at the moment
|
||||
if ( UMAGetSystemVersion() < 0x1050 )
|
||||
|
||||
Reference in New Issue
Block a user