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:
@@ -597,8 +597,9 @@ bool wxToolBar::Show( bool show )
|
|||||||
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
|
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
|
||||||
if (ownToolbarInstalled)
|
if (ownToolbarInstalled)
|
||||||
{
|
{
|
||||||
bResult = (HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ) != show);
|
bResult = ( IsWindowToolbarVisible(tlw) != show);
|
||||||
ShowHideWindowToolbar( tlw, show, false );
|
if ( bResult )
|
||||||
|
ShowHideWindowToolbar( tlw, show, false );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@@ -616,7 +617,10 @@ bool wxToolBar::IsShown() const
|
|||||||
bool ownToolbarInstalled ;
|
bool ownToolbarInstalled ;
|
||||||
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
|
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
|
||||||
if (ownToolbarInstalled)
|
if (ownToolbarInstalled)
|
||||||
bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef );
|
{
|
||||||
|
WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
|
||||||
|
bResult = IsWindowToolbarVisible(tlw) ;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
bResult = wxToolBarBase::IsShown();
|
bResult = wxToolBarBase::IsShown();
|
||||||
|
Reference in New Issue
Block a user