diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 46ab294af7..2b14153541 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -72,8 +72,6 @@ public: return OSXShowWithEffect(false, effect, timeout); } - virtual bool IsShownOnScreen() const wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; virtual void WarpPointer( int x, int y ) wxOVERRIDE; diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index e53690f4a9..beccd49723 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -2418,29 +2418,6 @@ wxByte wxWindowMac::GetTransparent() const return m_macAlpha ; } -bool wxWindowMac::IsShownOnScreen() const -{ - if ( GetPeer() && GetPeer()->IsOk() ) - { - bool peerVis = GetPeer()->IsVisible(); - bool wxVis = wxWindowBase::IsShownOnScreen(); - if( peerVis != wxVis ) - { - // CS : put a breakpoint here to investigate differences - // between native an wx visibilities - // the only place where I've encountered them until now - // are the hiding/showing sequences where the vis-changed event is - // first sent to the innermost control, while wx does things - // from the outmost control - wxVis = wxWindowBase::IsShownOnScreen(); - return wxVis; - } - - return GetPeer()->IsVisible(); - } - return wxWindowBase::IsShownOnScreen(); -} - #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON OSStatus