X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f30930a092c85f3255f8a0d79873cde438b0445..6178debcd342963974dbdce6ac2ddb2fbe89e42a:/src/osx/carbon/filedlg.cpp

diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index 719654a23a..158846b529 100644
--- a/src/osx/carbon/filedlg.cpp
+++ b/src/osx/carbon/filedlg.cpp
@@ -466,7 +466,7 @@ wxFileDialog::wxFileDialog(
 
 void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 {
-    wxNonOwnedWindow::Create( GetParent(), nativeWindow );
+    wxTopLevelWindow::Create( GetParent(), nativeWindow );
     
     if (HasExtraControlCreator())
     {
@@ -541,7 +541,11 @@ int wxFileDialog::ShowModal()
     SetupExtraControls(NavDialogGetWindow(dialog));
     
     if (err == noErr)
+    {
+        wxDialog::OSXBeginModalDialog();
         err = ::NavDialogRun(dialog);
+        wxDialog::OSXEndModalDialog();
+    }
 
     // clean up filter related data, etc.
     if (navFilterUPP)