]> git.saurik.com Git - wxWidgets.git/commitdiff
restrict change from r71719 because otherwise apps like docview sample in ddi mode...
authorStefan Csomor <csomor@advancedconcepts.ch>
Thu, 6 Sep 2012 14:24:28 +0000 (14:24 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Thu, 6 Sep 2012 14:24:28 +0000 (14:24 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/nonownedwnd.mm

index 1d5475532bd47716cfe042f655ed15d88f426271..76f14712b95e554113740cc1d07c31285f3e8ade 100644 (file)
@@ -688,7 +688,8 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
         if ( wxpeer )
         {
             // add to parent window before showing
         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 )
             {
                 NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
                 if ( parentView )