From 71d9783779303dc1fc92a327d42acb50ef13d747 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 5 Aug 2013 08:59:38 +0000 Subject: [PATCH] follow up parent chain to properly support modal dialog parents, see #15383 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/nonownedwnd.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index 279e45f..9e79c6a 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -658,7 +658,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) ) // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need // to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay // above the parent. - wxDialog * const parentDialog = wxDynamicCast(parent, wxDialog); + wxDialog * const parentDialog = parent == NULL ? NULL : wxDynamicCast(parent->MacGetTopLevelWindow(), wxDialog); if (parentDialog && parentDialog->IsModal()) { if (level == kCGFloatingWindowLevel) -- 2.7.4