Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-03-02 18:16:02 +00:00
parent 1404c3f382
commit e6b3b53c2c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/carbon/toolbar.cpp
View File

@@ -926,6 +926,7 @@ bool wxToolBar::Create(
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
{ {
#if wxOSX_USE_NATIVE_TOOLBAR
CFIndex count = CFGetRetainCount( m_macToolbar ) ; CFIndex count = CFGetRetainCount( m_macToolbar ) ;
// Leopard seems to have one refcount more, so we cannot check reliably at the moment // Leopard seems to have one refcount more, so we cannot check reliably at the moment
if ( UMAGetSystemVersion() < 0x1050 ) if ( UMAGetSystemVersion() < 0x1050 )
@@ -937,6 +938,7 @@ wxToolBar::~wxToolBar()
} }
CFRelease( (HIToolbarRef)m_macToolbar ); CFRelease( (HIToolbarRef)m_macToolbar );
m_macToolbar = NULL; m_macToolbar = NULL;
#endif // wxOSX_USE_NATIVE_TOOLBAR
} }
bool wxToolBar::Show( bool show ) bool wxToolBar::Show( bool show )