fixing visibility checks for native toolbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1d20b7f2c6
commit
a749a99f08
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user