X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff3e84ffdc91ee8a52b3ab646e48d44d62de80e1..f98bd6d6cf33f0475b5d737a2968b42b7ea0009f:/src/mac/carbon/filedlg.cpp

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index faca927d1a..9e73bcf2d3 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -30,12 +30,8 @@
     #include "PLStringFuncs.h"
 #endif
 
-#include "MoreFilesX.h"
-
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
-extern bool gUseNavServices;
-
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard
 // file reply record (so we can inspect the current selection)
@@ -135,7 +131,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
         bool isName = true ;
         wxString current ;
 
-        for ( unsigned int i = 0; i < filter2.Len() ; i++ )
+        for ( unsigned int i = 0; i < filter2.length() ; i++ )
         {
             if ( filter2.GetChar(i) == wxT('|') )
             {
@@ -215,7 +211,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
 
-                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )
                     return true ;
             }
         }
@@ -319,7 +315,6 @@ int wxFileDialog::ShowModal()
 
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;
-    CFArrayRef cfArray = NULL; // for popupExtension
     OpenUserDataRec myData;
     myData.defaultLocation = m_dir;
 
@@ -352,7 +347,7 @@ int wxFileDialog::ShowModal()
             dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
 
 #if TARGET_API_MAC_OSX
-        if (!(m_windowStyle & wxOVERWRITE_PROMPT))
+        if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))
             dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
 #endif
 
@@ -386,8 +381,6 @@ int wxFileDialog::ShowModal()
     // clean up filter related data, etc.
     if (navFilterUPP)
         ::DisposeNavObjectFilterUPP(navFilterUPP);
-    if (cfArray)
-        ::CFRelease(cfArray);
 
     if (err != noErr)
         return wxID_CANCEL;