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

avoiding double firing of visibility state changed for certain controls like multiline text controls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-02-23 09:45:10 +00:00
parent 841e47cfd7
commit ef53a8e814
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/window.cpp
View File

@@ -276,7 +276,13 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
break ;
case kEventControlVisibilityChanged :
thisWindow->MacVisibilityChanged() ;
// we might have two native controls attributed to the same wxWindow instance
// eg a scrollview and an embedded textview, make sure we only fire for the 'outer'
// control, as otherwise native and wx visibility are different
if ( thisWindow->GetPeer() != NULL && thisWindow->GetPeer()->GetControlRef() == controlRef )
{
thisWindow->MacVisibilityChanged() ;
}
break ;
case kEventControlEnabledStateChanged :
@@ -3199,7 +3205,17 @@ bool wxWindowMac::IsShownOnScreen() const
{
#if TARGET_API_MAC_OSX
if ( m_peer && m_peer->Ok() )
{
bool peerVis = m_peer->IsVisible();
bool wxVis = wxWindowBase::IsShownOnScreen();
if( peerVis != wxVis )
{
wxVis = wxWindowBase::IsShownOnScreen();
return wxVis;
}
return m_peer->IsVisible();
}
#endif
return wxWindowBase::IsShownOnScreen();