X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ee39f97af532406533efc0eff451f7999e0917e..7ad25aed02fa53612cd94a422904667c46fafcbb:/src/mac/carbon/mdi.cpp?ds=sidebyside diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index c7d898778b..c3951ca0e1 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -9,18 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mdi.h" -#endif - #include "wx/wxprec.h" #if wxUSE_MDI -#include "wx/mdi.h" -#include "wx/menu.h" -#include "wx/settings.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/mdi.h" + #include "wx/log.h" + #include "wx/menu.h" + #include "wx/settings.h" + #include "wx/statusbr.h" +#endif #include "wx/mac/private.h" #include "wx/mac/uma.h" @@ -290,11 +289,14 @@ bool wxMDIParentFrame::ShouldBeVisible() const node; node = node->GetNext() ) { - if ( !wxDynamicCast(node->GetData(), wxMDIChildFrame) + wxWindow *win = node->GetData(); + + if ( win->IsShown() + && !wxDynamicCast(win, wxMDIChildFrame) #if wxUSE_STATUSBAR - && node->GetData() != GetStatusBar() + && win != GetStatusBar() #endif // wxUSE_STATUSBAR - && node->GetData() != GetClientWindow() ) + && win != GetClientWindow() ) { // if we have a non-MDI child, do remain visible so that it could // be used