Ticket #12187: wxWidgets-workswhenmodal.2.diff

src/osx/cocoa/nonownedwnd.mm

@@ -14 +14 @@
     #include "wx/nonownedwnd.h"
     #include "wx/frame.h"
     #include "wx/app.h"
+    #include "wx/dialog.h"
 #endif
 
 #include "wx/osx/private.h"
@@ -408 +409 @@
     }
 }
 
-void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoint& pos, const wxSize& size,
+void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
@@ -516 +517 @@
         defer:NO
         ];
 
+    // If the parent is modal, wxFRAME_FLOAT_ON_PARENT
+    // needs to be in kCGUtilityWindowLevel not kCGFloatingWindowLevel
+    // to stay above the parent.
+    wxDialog* parentDialog = wxDynamicCast(parent, wxDialog);
+    if (parentDialog != NULL && parentDialog->IsModal())
+    {
+        if (level == kCGFloatingWindowLevel)
+        {
+            level = kCGUtilityWindowLevel;
+        }
+
+        // Cocoa's modal loop does not process other windows by default,
+        // but don't call this on normal window levels so
+        // nested modal dialogs will still behave modally.
+        if (level != kCGNormalWindowLevel)
+        {
+            if ([m_macWindow isKindOfClass:[NSPanel class]])
+            {
+                [(NSPanel*)m_macWindow setWorksWhenModal:YES];
+            }
+        }
+    }
+
     [m_macWindow setLevel:level];
 
     [m_macWindow setDelegate:controller];