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

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index ca9c011d89bbedebe443bc724aaeb0c88c742ea0..f3a127ab469322438a0e982347a9db29381263ce 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -927,6 +927,11 @@ bool wxToolBar::Create(
 wxToolBar::~wxToolBar()
 {
 #if wxOSX_USE_NATIVE_TOOLBAR
 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 )
     CFIndex count = CFGetRetainCount( m_macToolbar ) ;
     // Leopard seems to have one refcount more, so we cannot check reliably at the moment
     if ( UMAGetSystemVersion() < 0x1050 )