Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / carbon / filedlg.cpp

diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index 719654a23ae08a04abdde5098e61b26cad8e080f..158846b529923de8e3c7190e5e7935401ae6fdaf 100644 (file)
--- a/src/osx/carbon/filedlg.cpp
+++ b/src/osx/carbon/filedlg.cpp
@@ -466,7 +466,7 @@ wxFileDialog::wxFileDialog(
 
 void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 {
 
 void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 {

-    wxNonOwnedWindow::Create( GetParent(), nativeWindow );
+    wxTopLevelWindow::Create( GetParent(), nativeWindow );

     
     if (HasExtraControlCreator())
     {
     
     if (HasExtraControlCreator())
     {


@@ -541,7 +541,11 @@ int wxFileDialog::ShowModal()
     SetupExtraControls(NavDialogGetWindow(dialog));
     
     if (err == noErr)
     SetupExtraControls(NavDialogGetWindow(dialog));
     
     if (err == noErr)

+    {
+        wxDialog::OSXBeginModalDialog();

         err = ::NavDialogRun(dialog);
         err = ::NavDialogRun(dialog);

+        wxDialog::OSXEndModalDialog();
+    }

 
     // clean up filter related data, etc.
     if (navFilterUPP)
 
     // clean up filter related data, etc.
     if (navFilterUPP)