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

corrected hiding/showing of native mac controls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-02-28 12:23:17 +00:00
parent 19ff2a7bd5
commit c809f3be86
8 changed files with 128 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mac/control.cpp
View File

@@ -266,6 +266,7 @@ void wxControl::MacPostControlCreate()
ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
::UMAEmbedControl( m_macControl , container ) ;
m_macControlIsShown = true ;
MacAdjustControlRect() ;
wxAssociateControlWithMacControl( m_macControl , this ) ;
}
@@ -416,12 +417,19 @@ void wxControl::MacSuperShown( bool show )
{
if ( !show )
{
::UMAHideControl( m_macControl ) ;
if ( m_macControlIsShown )
{
::UMAHideControl( m_macControl ) ;
m_macControlIsShown = false ;
}
}
else
{
if ( m_isShown )
if ( MacIsReallyShown() && !m_macControlIsShown )
{
::UMAShowControl( m_macControl ) ;
m_macControlIsShown = true ;
}
}
}
@@ -541,10 +549,22 @@ bool wxControl::Show(bool show)
if ( m_macControl )
{
if ( show )
::UMAShowControl( m_macControl ) ;
if ( !show )
{
if ( m_macControlIsShown )
{
::UMAHideControl( m_macControl ) ;
m_macControlIsShown = false ;
}
}
else
::UMAHideControl( m_macControl ) ;
{
if ( MacIsReallyShown() && !m_macControlIsShown )
{
::UMAShowControl( m_macControl ) ;
m_macControlIsShown = true ;
}
}
}
return TRUE ;
}