From 462d81dda4f6f92208b5de4958358ddc5f169c09 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Nov 2013 17:00:56 +0000 Subject: [PATCH] Correct check for animating non-visible windows added in r75130. Check whether the parent is not shown instead of checking the window itself because the window is never shown when we're in process of showing it. We need to avoid animations in the case when it still won't be shown even after showing it, and this is achieved by checking its parent visibility. Closes #15643. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index b1e1178792..5fed10ca6c 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -675,7 +675,8 @@ wxWindowMSW::MSWShowWithEffect(bool show, unsigned timeout) { #if wxUSE_DYNLIB_CLASS - if ( effect == wxSHOW_EFFECT_NONE || !IsShownOnScreen() ) + if ( effect == wxSHOW_EFFECT_NONE || + (GetParent() && !GetParent()->IsShownOnScreen()) ) return Show(show); if ( !wxWindowBase::Show(show) )