From b7e3daf441bca9d88c0a3f7a55f40919973cbb4b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 6 Sep 2012 14:24:28 +0000 Subject: [PATCH] restrict change from r71719 because otherwise apps like docview sample in ddi mode are not allowing their different child frames to be z-reordered git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/nonownedwnd.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index 1d5475532b..76f14712b9 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -688,7 +688,8 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show) if ( wxpeer ) { // add to parent window before showing - if ( wxpeer->GetParent() ) + wxDialog * const dialog = wxDynamicCast(wxpeer, wxDialog); + if ( wxpeer->GetParent() && dialog && dialog->IsModal()) { NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget(); if ( parentView ) -- 2.45.2