From e6b3b53c2c20fe75dc410a22a99b88a63653aef5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 2 Mar 2010 18:16:02 +0000 Subject: [PATCH] Enclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR. Don't use m_macToolbar which is only used when the toolbar is a native one when we don't really use the native toolbar. This should fix compilation in case wxOSX_USE_NATIVE_TOOLBAR is 0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/toolbar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp index 58cc4af000..ca9c011d89 100644 --- a/src/osx/carbon/toolbar.cpp +++ b/src/osx/carbon/toolbar.cpp @@ -926,6 +926,7 @@ bool wxToolBar::Create( wxToolBar::~wxToolBar() { +#if wxOSX_USE_NATIVE_TOOLBAR CFIndex count = CFGetRetainCount( m_macToolbar ) ; // Leopard seems to have one refcount more, so we cannot check reliably at the moment if ( UMAGetSystemVersion() < 0x1050 ) @@ -937,6 +938,7 @@ wxToolBar::~wxToolBar() } CFRelease( (HIToolbarRef)m_macToolbar ); m_macToolbar = NULL; +#endif // wxOSX_USE_NATIVE_TOOLBAR } bool wxToolBar::Show( bool show ) -- 2.49.0