From a749a99f086cb511f6fa8a64bad76beda7a800a6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 17 Sep 2005 14:18:50 +0000 Subject: [PATCH] fixing visibility checks for native toolbars git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toolbar.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 500226f1ad..506f9ede00 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -597,8 +597,9 @@ bool wxToolBar::Show( bool show ) MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) { - bResult = (HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ) != show); - ShowHideWindowToolbar( tlw, show, false ); + bResult = ( IsWindowToolbarVisible(tlw) != show); + if ( bResult ) + ShowHideWindowToolbar( tlw, show, false ); } else #endif @@ -616,7 +617,10 @@ bool wxToolBar::IsShown() const bool ownToolbarInstalled ; MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) - bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ); + { + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + bResult = IsWindowToolbarVisible(tlw) ; + } else #endif bResult = wxToolBarBase::IsShown(); -- 2.47.2