make XPM data pointer parameter fully const

[wxWidgets.git] / src / mac / carbon / dirdlg.cpp

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index f63080f4e1f9db876c40074ff5caca1251f10c64..57e384eaff4ba496533d4ee5f7b320c9c1e26724 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -77,16 +77,17 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 
 int wxDirDialog::ShowModal()
 {
 
 int wxDirDialog::ShowModal()
 {

-    NavDialogRef dialog;
+    NavDialogRef dialog = NULL;

     NavDialogCreationOptions options;
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;
 
     err = NavGetDefaultDialogCreationOptions(&options);
     NavDialogCreationOptions options;
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;
 
     err = NavGetDefaultDialogCreationOptions(&options);

+    options.optionFlags &= ~kNavAllowMultipleFiles;

     if (err == noErr)
     {
     if (err == noErr)
     {

-        wxMacCFStringHolder message(m_message, m_font.GetEncoding());
+        wxCFStringRef message(m_message, m_font.GetEncoding());

         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
         if (err == noErr)
         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
         if (err == noErr)


@@ -135,6 +136,9 @@ int wxDirDialog::ShowModal()
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 

+       if ( dialog )
+       ::NavDialogDispose(dialog);
+

     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }