Use new function GetItemLabel

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index b0884be3478482ba6b2cd4a82246a7cf9dbab069..38bce047595c01ad972ef7a7fb9a1070cd872e97 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,50 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
-// Purpose:     wxFileDialog 
-// Author:      AUTHOR
+// Name:        src/mac/carbon/filedlg.cpp
+// Purpose:     wxFileDialog
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "filedlg.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_FILEDLG

 
 

-#include "wx/defs.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"

 #include "wx/filedlg.h"
 #include "wx/filedlg.h"

-#include "wx/intl.h"

 
 

-#if !defined(__UNIX__)
-  #include "PLStringFuncs.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-#endif
+#include "wx/tokenzr.h"
+#include "wx/filename.h"

 
 

-// begin wxmac
+#include "wx/mac/private.h"

 
 

-#if defined(__UNIX__)
-  #include <Carbon/Carbon.h>
-#else
-  #include <Navigation.h>
+#ifndef __DARWIN__
+    #include <Navigation.h>
+    #include "PLStringFuncs.h"

 #endif
 
 #endif
 

-#ifndef __UNIX__
-  #include "morefile.h"
-  #include "moreextr.h"
-  #include "fullpath.h"
-  #include "fspcompa.h"
-  #include "PLStringFuncs.h"
-#endif
-
-extern bool gUseNavServices ;
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

 
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard
 
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard


@@ -52,806 +40,418 @@ extern bool gUseNavServices ;
 // and a copy of the "previous" file spec of the reply record
 // so we can see if the selection has changed
 
 // and a copy of the "previous" file spec of the reply record
 // so we can see if the selection has changed
 

-const int kwxMacFileTypes = 10 ;
-
-struct OpenUserDataRec {
-  int           currentfilter ;
-  wxString      name [kwxMacFileTypes] ;
-  wxString      extensions[kwxMacFileTypes] ;
-       OSType                          filtermactypes[kwxMacFileTypes] ;
-       int                                       numfilters ;
+struct OpenUserDataRec
+{
+  int                currentfilter ;
+  bool               saveMode ;
+  wxArrayString      name ;
+  wxArrayString      extensions ;
+  wxArrayLong        filtermactypes ;
+  wxString           defaultLocation;
+  CFArrayRef         menuitems ;

 };
 };

+

 typedef struct OpenUserDataRec
 typedef struct OpenUserDataRec

-       OpenUserDataRec, *OpenUserDataRecPtr;
+OpenUserDataRec, *OpenUserDataRecPtr;

 
 

-static pascal void     NavEventProc(
-                                                               NavEventCallbackMessage         inSelector,
-                                                               NavCBRecPtr                                     ioParams,
-                                                               NavCallBackUserData                     ioUserData);
+static pascal void NavEventProc(
+    NavEventCallbackMessage inSelector,
+    NavCBRecPtr ioParams,
+    NavCallBackUserData ioUserData );

 
 

-#if TARGET_CARBON
-               static NavEventUPP      sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
-#else
-               static NavEventUPP      sStandardNavEventFilter = NewNavEventProc(NavEventProc);
-#endif
+static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc);

 
 

-static pascal void
-NavEventProc(
-       NavEventCallbackMessage         inSelector,
-       NavCBRecPtr                                     ioParams,
-       NavCallBackUserData     ioUserData      )
+static pascal void NavEventProc(
+    NavEventCallbackMessage inSelector,
+    NavCBRecPtr ioParams,
+    NavCallBackUserData ioUserData )

 {
 {

-         OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
-       if (inSelector == kNavCBEvent) {        
-                       // In Universal Headers 3.2, Apple changed the definition of
-               /*
-               #if UNIVERSAL_INTERFACES_VERSION >= 0x0320 // Universal Headers 3.2
-                       UModalAlerts::ProcessModalEvent(*(ioParams->eventData.eventDataParms.event));
-                       
-               #else
-                       UModalAlerts::ProcessModalEvent(*(ioParams->eventData.event));
-               #endif
-               */
-               
-         wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
-       } else if ( inSelector == kNavCBPopupMenuSelect )
-       {
-         NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
-         data->currentfilter = menu->menuType ;
-       }
+    OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
+    if (inSelector == kNavCBEvent)
+    {
+    }
+    else if ( inSelector == kNavCBStart )
+    {
+        if (data && !(data->defaultLocation).empty())
+        {
+            // Set default location for the modern Navigation APIs
+            // Apple Technical Q&A 1151
+            FSRef theFile;
+            wxMacPathToFSRef(data->defaultLocation, &theFile);
+            AEDesc theLocation = { typeNull, NULL };
+            if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
+                ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
+        }
+
+        NavMenuItemSpec  menuItem;
+        menuItem.version = kNavMenuItemSpecVersion;
+        menuItem.menuCreator = 'WXNG';
+        menuItem.menuType = data->currentfilter;
+        wxMacStringToPascal( data->name[data->currentfilter] , (StringPtr)(menuItem.menuItemName) ) ;
+        ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
+    }
+    else if ( inSelector == kNavCBPopupMenuSelect )
+    {
+        NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
+        const size_t numFilters = data->extensions.GetCount();
+
+        if ( menu->menuType < numFilters )
+        {
+            data->currentfilter = menu->menuType ;
+            if ( data->saveMode )
+            {
+                int i = menu->menuType ;
+
+                // isolate the first extension string
+                wxString firstExtension = data->extensions[i].BeforeFirst('|').BeforeFirst(';');
+
+                wxString extension = firstExtension.AfterLast('.') ;
+                wxString sfilename ;
+
+                wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
+                sfilename = cfString.AsString() ;
+
+                int pos = sfilename.Find('.', true) ;
+                if ( pos != wxNOT_FOUND )
+                {
+                    sfilename = sfilename.Left(pos+1)+extension ;
+                    cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;
+                    NavDialogSetSaveFileName( ioParams->context , cfString ) ;
+                }
+            }
+        }
+    }

 }
 
 }
 

-char * gfilters[] =
-{
-       "*.TXT" ,
-       "*.TIF" ,
-       "*.JPG" ,
-       
-       NULL 
-} ;
-
-OSType gfiltersmac[] =
+void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )

 {
 {

-       'TEXT' ,
-       'TIFF' ,
-       'JPEG' ,
-       
-       '****'
-} ;
-
-
-#if !TARGET_CARBON
-
-static void wxMacSetupStandardFile(short newVRefNum, long newDirID) 
-{ 
-       enum 
-       { SFSaveDisk = 0x214, CurDirStore = 0x398 };
-       *(short *) SFSaveDisk = -1 * newVRefNum; 
-       *(long *) CurDirStore = newDirID; 
+    myData->menuitems = NULL ;
+    myData->currentfilter = 0 ;
+    myData->saveMode = false ;
+
+    if ( !filter.empty() )
+    {
+        wxString filter2(filter) ;
+        int filterIndex = 0;
+        bool isName = true ;
+        wxString current ;
+
+        for ( unsigned int i = 0; i < filter2.length() ; i++ )
+        {
+            if ( filter2.GetChar(i) == wxT('|') )
+            {
+                if ( isName )
+                {
+                    myData->name.Add( current ) ;
+                }
+                else
+                {
+                    myData->extensions.Add( current ) ;
+                    ++filterIndex ;
+                }
+
+                isName = !isName ;
+                current = wxEmptyString ;
+            }
+            else
+            {
+                current += filter2.GetChar(i) ;
+            }
+        }
+        // we allow for compatibility reason to have a single filter expression (like *.*) without
+        // an explanatory text, in that case the first part is name and extension at the same time
+
+        wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
+        if ( current.empty() )
+            myData->extensions.Add( myData->name[filterIndex] ) ;
+        else
+            myData->extensions.Add( current ) ;
+        if ( filterIndex == 0 || isName )
+            myData->name.Add( current ) ;
+
+        ++filterIndex ;
+
+        const size_t extCount = myData->extensions.GetCount();
+        for ( size_t i = 0 ; i < extCount; i++ )
+        {
+            wxUint32 fileType, creator;
+            wxString extension = myData->extensions[i];
+
+            // Remove leading '*'
+            if (extension.length() && (extension.GetChar(0) == '*'))
+                extension = extension.Mid( 1 );
+
+            // Remove leading '.'
+            if (extension.length() && (extension.GetChar(0) == '.'))
+                extension = extension.Mid( 1 );
+
+            if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
+                myData->filtermactypes.Add( (OSType)fileType );
+            else
+                myData->filtermactypes.Add( '****' ); // We'll fail safe if it's not recognized
+        }
+    }

 }
 
 }
 

-static void wxMacSetupStandardFileFromPath( const char* s )
+static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataRecPtr data)

 {
 {

-       Str255  volume ;
-       Str255  path ;
-       short   vRefNum ;
-       long dirRef ;
-       short   i,j ;
-       Boolean isDirectory ;
-       
-       for (i=0 ; (s[i]!=0) && (s[i]!=':') ;i++)
-               {
-               volume[i]=s[i] ;
-               }
-       volume[i]=':' ;
-       volume[i+1]=0 ;
-       
-       // then copy the rest of the filename
-       
-       for (j=0;(s[i]!=0);i++,j++)
-               {
-               path[j]=s[i] ;          
-               }
-       path[j]=0 ;
-       
-       c2pstr((Ptr) volume) ;
-       c2pstr((Ptr) path) ;
-       
-       SetVol(volume, 0) ;
-       GetVol( NULL, &vRefNum ) ;
-               
-       GetDirectoryID( vRefNum , fsRtDirID , path , &dirRef , &isDirectory ) ;
-       wxMacSetupStandardFile(vRefNum, dirRef)         ;
-}
+    wxString file(filename) ;
+    file.MakeUpper() ;

 
 

-enum {
-       kSelectItem = 10,                       // select button item number
-       kSFGetFileDlgID = 251,  // dialog resource number
-       kStrListID = 251,                       // our strings
-       kSelectStrNum = 1,                      // word 'Select: ' for button
-       kDesktopStrNum = 2,                     // word 'Desktop' for button
-       kSelectNoQuoteStrNum = 3,       // word 'Select: ' for button
-       
-       kUseQuotes = true,                      // parameter for SetButtonName
-       kDontUseQuotes = false
-};
+    if ( data->extensions.GetCount() > 0 )
+    {
+        //for ( int i = 0 ; i < data->numfilters ; ++i )
+        int i = data->currentfilter ;
+        if ( data->extensions[i].Right(2) == wxT(".*") )
+            return true ;
+
+        {
+            if ( type == (OSType)data->filtermactypes[i] )
+                return true ;
+
+            wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
+            while ( tokenizer.HasMoreTokens() )
+            {
+                wxString extension = tokenizer.GetNextToken() ;
+                if ( extension.GetChar(0) == '*' )
+                    extension = extension.Mid(1) ;
+                extension.MakeUpper();
+
+                if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )
+                    return true ;
+            }
+        }

 
 

-static void GetLabelString(StringPtr theStr, short stringNum)
-{
-       GetIndString(theStr, kStrListID, stringNum);
-}
+        return false ;
+    }

 
 

-static void CopyPStr(StringPtr src, StringPtr dest)
-{
-       BlockMoveData(src, dest, 1 + src[0]);
+    return true ;

 }
 
 }
 

-static char GetSelectKey(void)
+#if !TARGET_API_MAC_OSX
+static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)

 {
 {

-       // this is the key used to trigger the select button
-       
-       // NOT INTERNATIONAL SAVVY; should at least grab it from resources
-       
-       return 's';
-}
+    OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
+    // return true if this item is invisible or a file

 
 

-// FlashButton briefly highlights the dialog button 
-// as feedback for key equivalents
+    Boolean visibleFlag;
+    Boolean folderFlag;

 
 

-static void FlashButton(DialogPtr theDlgPtr, short buttonID)
-{
-       short   buttonType;
-       Handle  buttonHandle;
-       Rect    buttonRect;
-       unsigned long   finalTicks;
-       
-       GetDialogItem(theDlgPtr, buttonID, &buttonType, &buttonHandle, &buttonRect);
-       HiliteControl((ControlHandle) buttonHandle, kControlButtonPart);
-       Delay(10, &finalTicks);
-       HiliteControl((ControlHandle) buttonHandle, 0);
-}
+    visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible);
+    folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10);

 
 

-static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2)
-{
-       return (spec1->vRefNum == spec2->vRefNum
-                       && spec1->parID == spec2->parID
-                       && EqualString(spec1->name, spec2->name, false, false));
-}
-// MyModalDialogFilter maps a key to the Select button, and handles
-// flashing of the button when the key is hit
+    // because the semantics of the filter proc are "true means don't show
+    // it" we need to invert the result that we return

 
 

-static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
-                                                                                       short *item, void *dataPtr)
-{
-#pragma unused (dataPtr)
-
-       // make certain the proper dialog is showing, 'cause standard file
-       // can nest dialogs but calls the same filter for each
-       
-       if (((WindowPeek) theDlgPtr)->refCon == sfMainDialogRefCon)
-       {
-               // check if the select button was hit
-               /*
-               if ((eventRec->what == keyDown)
-                       && (eventRec->modifiers & cmdKey) 
-                       && ((eventRec->message & charCodeMask) == GetSelectKey()))
-               {
-                       *item = kSelectItem;
-                       FlashButton(theDlgPtr, kSelectItem);
-                       return true;
-               }
-               */
-       }
-               
-       return false;
-}
-#endif !TARGET_CARBON
+    if ( !visibleFlag )
+        return true ;

 
 

-void MakeUserDataRec(OpenUserDataRec   *myData , const wxString& filter )
-{
-  myData->currentfilter = 0 ;
-  
-       if ( filter && filter[0] )
-       {
-         wxString filter2(filter) ;
-    int filterIndex = 0;
-    bool isName = true ;
-    wxString current ;
-    for( unsigned int i = 0; i < filter2.Len(); i++ )
-    {
-       if( filter2.GetChar(i) == wxT('|') )
-       {
-        if( isName ) {
-          myData->name[filterIndex] = current ;
-        }
-        else {
-          myData->extensions[filterIndex] = current.MakeUpper() ;
-          ++filterIndex ;
-        }
-        isName = !isName ;
-         current = "" ;
-       }
-       else
-       {
-        current += filter2.GetChar(i) ;
-       }
-    }
-    if ( filterIndex > 0 )
+    if ( !folderFlag )

     {
     {

-      wxASSERT_MSG( !isName , "incorrect format of format string" ) ;
-      myData->extensions[filterIndex] = current.MakeUpper() ;
-      ++filterIndex ;
+        wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
+        return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;

     }
 
     }
 

-               myData->numfilters = filterIndex ;
-               for ( int i = 0 ; i < myData->numfilters ; i++ )
-               {
-                       int j ;
-                       for ( j = 0 ; gfilters[j] ; j++ )
-                       {
-                               if ( strcmp( myData->extensions[i] , gfilters[j] ) == 0 )
-                               {
-                                       myData->filtermactypes[i] = gfiltersmac[j] ;
-                                       break ;
-                               }
-                       }
-                       if( gfilters[j] == NULL )
-                       {
-                               myData->filtermactypes[i] = '****' ;
-                       }
-               }
-       }
-       else
-       {
-               myData->numfilters = 0 ;
-       }
-
+    return false ;

 }
 }

-void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
+#endif
+
+// end wxmac
+
+wxFileDialog::wxFileDialog(
+    wxWindow *parent, const wxString& message,
+    const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
+    long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
+    : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)

 {
 {

-       Point                           thePt;
-       OpenUserDataRec                 myData;
-       FSSpec                          tempSpec;
-       Boolean                         folderFlag;
-       Boolean                         wasAliasedFlag;
-       DlgHookYDUPP            dlgHookUPP;
-       ModalFilterYDUPP        myModalFilterUPP;
-       OSErr                           err;
-       SFTypeList                      types ;
-       
-       
-       // presumably we're running System 7 or later so CustomGetFile is
-       // available
-       
-       // set initial contents of Select button to a space
-       
-       memcpy( theSFR->sfFile.name , "\p " , 2 ) ;
-       
-       // point the user data parameter at the reply record so we can get to it later
-       
-       MakeUserDataRec( &myData , filter ) ;
-       // display the dialog
-
-#if !TARGET_CARBON
-       
-       dlgHookUPP = NULL ;
-//     dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
-       myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);
-       
-       thePt.h = thePt.v = -1; // center dialog
-       
-       ParamText( message , NULL , NULL , NULL ) ;
-       
-       CustomGetFile(  fileFilter, 
-                                       -1,                                     // show all types
-                                       NULL,
-                                       theSFR,
-                                       kSFGetFileDlgID,
-                                       thePt,                          // top left point
-                                       dlgHookUPP,
-                                       myModalFilterUPP,
-                                       nil,                            // activate list
-                                       nil,                            // activate proc
-                                       &myData);
-                                       
-       DisposeRoutineDescriptor(dlgHookUPP);
-       DisposeRoutineDescriptor(myModalFilterUPP);
-#else
-#endif 
-       // if cancel wasn't pressed and no fatal error occurred...
-       
-       if (theSFR->sfGood)
-       {
-               // if no name is in the reply record file spec,
-               // use the file spec of the parent folder
-               
-               if (theSFR->sfFile.name[0] == '\0')
-               {
-                       err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,
-                                                               "\p", &tempSpec);
-                       if (err == noErr)
-                       {
-                               theSFR->sfFile = tempSpec;
-                       }
-                       else
-                       {
-                               // no name to return, forget it
-                               
-                               theSFR->sfGood = false;
-                       }
-               }
-               
-               // if there is now a name in the file spec, check if it's
-               // for a folder or a volume
-               
-               if (theSFR->sfFile.name[0] != '\0')
-               {
-                       // the parID of the root of a disk is always fsRtParID == 1
-                       
-                       if (theSFR->sfFile.parID == fsRtParID)
-                       {
-                               theSFR->sfIsVolume = true;
-                               theSFR->sfIsFolder = false;     // it would be reasonable for this to be true, too
-                       }
-                       
-                       // we have a valid FSSpec, now let's make sure it's not for an alias file
-                       
-                       err = ResolveAliasFile(&theSFR->sfFile, true, &folderFlag, &wasAliasedFlag);
-                       if (err != noErr)
-                       {
-                               theSFR->sfGood = false;
-                       }
-                       
-                       // did the alias resolve to a folder?
-                       
-                       if (folderFlag  && ! theSFR->sfIsVolume)
-                       {
-                               theSFR->sfIsFolder = true;
-                       }
-               }
-       }
+    wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;

 }
 
 }
 

-static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
+pascal Boolean CrossPlatformFilterCallback(
+    AEDesc *theItem,
+    void *info,
+    void *callBackUD,
+    NavFilterModes filterMode )

 {
 {

-         Str255                        filename ;
-               PLstrcpy( filename , name ) ;
-
-               if ( data->numfilters > 0 )
-               {
-               for( int j = 1 ; j <= filename[0] ; j++ )
-               {
-                       filename[j] = toupper( filename[j] ) ;
-               }
-               //for ( int i = 0 ; i < data->numfilters ; ++i )
-               int i = data->currentfilter ;
-               if ( data->extensions[i].Right(2) == ".*" )
-                 return true ;
-                 
-               {
-                       if ( type == data->filtermactypes[i] )
-                               return true ;
-
-        wxString extension = data->extensions[i] ;
-        if ( extension.GetChar(0) == '*' )
-          extension = extension.Mid(1) ;
-
-                       if ( filename[0] >= extension.Len() && extension == (char*) filename + 1 + filename[0] - extension.Len() )
-                                       return true ;
-               }
-               return false ;
-       }
-       return true ;
-}
+    OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;

 
 

-static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
-{      
-       OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
-       // return true if this item is invisible or a file
-
-       Boolean visibleFlag;
-       Boolean folderFlag;
-       
-       visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible);
-       folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10);
-       
-       // because the semantics of the filter proc are "true means don't show
-       // it" we need to invert the result that we return
-       
-       if ( !visibleFlag )
-               return true ;
-               
-       if ( !folderFlag )
-       {
-               return !CheckFile( myCInfoPBPtr->hFileInfo.ioNamePtr , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
-       }       
-               
-       return false ;
-}
+    if (filterMode == kNavFilteringBrowserList)
+    {
+        // We allow navigation to all folders. For files, we check against the current
+        // filter string.
+        // However, packages should be dealt with like files and not like folders. So
+        // check if a folder is a package before deciding what to do.
+        FSRef fsref;
+        NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
+        AECoerceDesc (theItem, typeFSRef, theItem);
+        if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) != noErr)
+            return true;
+
+        if ( theInfo->isFolder )
+        {
+            // check bundle bit (using Finder Services - used by OS9 on some bundles)
+            FSCatalogInfo catalogInfo;
+            if (FSGetCatalogInfo (&fsref, kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL) != noErr)
+                return true;
+
+            // Check bundle item (using Launch Services - used by OS-X through info.plist or APP)
+            LSItemInfoRecord lsInfo;
+            if (LSCopyItemInfoForRef(&fsref, kLSRequestBasicFlagsOnly, &lsInfo ) != noErr)
+                return true;
+
+            // If it's not a bundle, then it's a normal folder and it passes our filter
+            FileInfo *fileInfo = (FileInfo *) catalogInfo.finderInfo;
+            if ( !(fileInfo->finderFlags & kHasBundle) &&
+                 !(lsInfo.flags & (kLSItemInfoIsApplication | kLSItemInfoIsPackage)) )
+                return true;
+        }

 
 

-// end wxmac
+        wxString file = wxMacFSRefToPath( &fsref ) ;
+        return CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;

 
 

-wxString wxFileSelector(const char *title,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *filter, int flags,
-                     wxWindow *parent, int x, int y)
+    }
+
+    return true;
+}
+
+int wxFileDialog::ShowModal()

 {
 {

-    // If there's a default extension specified but no filter, we create a suitable
-    // filter.
-
-    wxString filter2("");
-    if ( defaultExtension && !filter )
-        filter2 = wxString("*.") + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
-
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-    else
-        defaultDirString = "";
+    OSErr err;
+    NavDialogCreationOptions dialogCreateOptions;

 
 

-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-    else
-        defaultFilenameString = "";
+    // set default options
+    ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);

 
 

-    wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
+    // this was always unset in the old code
+    dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
-    }
-    else
-        return wxGetEmptyString();
-}
+    wxMacCFStringHolder message(m_message, m_font.GetEncoding());
+    dialogCreateOptions.windowTitle = message;

 
 

-WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
-                       int* defaultFilterIndex,
-                       const char *filter,
-                       int       flags,
-                       wxWindow* parent,
-                       int       x,
-                       int       y)
+    wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
+    dialogCreateOptions.saveFileName = defaultFileName;

 
 

-{
-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
+    NavDialogRef dialog;
+    NavObjectFilterUPP navFilterUPP = NULL;
+    OpenUserDataRec myData;
+    myData.defaultLocation = m_dir;
+
+    MakeUserDataRec(&myData , m_wildCard);
+    myData.currentfilter = m_filterIndex;
+    size_t numFilters = myData.extensions.GetCount();
+    if (numFilters)

     {
     {

-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
+            numFilters , &kCFTypeArrayCallBacks ) ;
+        dialogCreateOptions.popupExtension = popup ;
+        myData.menuitems = dialogCreateOptions.popupExtension ;
+        for ( size_t i = 0 ; i < numFilters ; ++i )
+        {
+            CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] , m_font.GetEncoding() ) ) ;
+        }

     }
     }

-    else
-        return wxGetEmptyString();
-}

 
 

-wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
-        const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
-        long style, const wxPoint& pos)
-{
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-    m_path = "";
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_filterIndex = 1;
-}
+    if (HasFdFlag(wxFD_SAVE))
+    {
+        myData.saveMode = true;

 
 

+        dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
+        dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
+        if (!numFilters)
+            dialogCreateOptions.optionFlags |= kNavNoTypePopup;

 
 

-Boolean CrossPlatformFilterCallback (
-    AEDesc *theItem, 
-    void *info, 
-    void *callBackUD, 
-    NavFilterModes filterMode
-)
-{
-       bool display = true;
-       OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
-
-       if (filterMode == kNavFilteringBrowserList)
-       {
-         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
-               if (theItem->descriptorType == typeFSS && !theInfo->isFolder)
-               {
-                 FSSpec        spec;
-                 memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
-                 display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
-               }
-       }
-
-       return display;
-}
+        // The extension is important
+        if (numFilters < 2)
+            dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;

 
 

-int wxFileDialog::ShowModal()
-{
-       #if !TARGET_CARBON
-       if ( !gUseNavServices )
-       {
-       if ( m_dialogStyle & wxSAVE )
-       {
-               StandardFileReply       reply ;
-               Str255                          prompt ;
-               Str255                          filename ;
-
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)prompt, m_message) ;
-#else
-               strcpy((char *)prompt, m_message) ;
-               c2pstr((char *)prompt ) ;
-#endif
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)filename, m_fileName) ;
-#else
-               strcpy((char *)filename, m_fileName) ;
-               c2pstr((char *)filename ) ;
+#if TARGET_API_MAC_OSX
+        if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))
+            dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;

 #endif
 
 #endif
 

-               #if !TARGET_CARBON
-               
-               StandardPutFile( prompt , filename , &reply ) ;
-       
-               #else
-               #endif
-               if ( reply.sfGood == false )
-               {
-                       m_path = "" ;
-                       return wxID_CANCEL ;
-               }
-               else
-               {
-                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
-                       return wxID_OK ;
-               }
-       }
-       else
-       {
-               OSType types = '????' ;
-               Str255                          prompt ;
-               Str255                          path ;
-
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)prompt, m_message) ;
-#else
-               strcpy((char *)prompt, m_message) ;
-               c2pstr((char *)prompt ) ;
-#endif
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)path, m_dir ) ;
-#else
-               strcpy((char *)path, m_dir ) ;
-               c2pstr((char *)path ) ;
-#endif
+        err = ::NavCreatePutFileDialog(
+            &dialogCreateOptions,
+            kNavGenericSignature, // Suppresses the 'Default' (top) menu item
+            kNavGenericSignature,
+            sStandardNavEventFilter,
+            &myData, // for defaultLocation
+            &dialog );
+    }
+    else
+    {
+        // let the user select bundles/programs in dialogs
+        dialogCreateOptions.optionFlags |= kNavSupportPackages;
+
+        navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
+        err = ::NavCreateGetFileDialog(
+            &dialogCreateOptions,
+            NULL, // NavTypeListHandle
+            sStandardNavEventFilter,
+            NULL, // NavPreviewUPP
+            navFilterUPP,
+            (void *) &myData, // inClientData
+            &dialog );
+    }

 
 

-               StandardFileReply       reply ;
-               FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
-               #if !TARGET_CARBON
-               crossPlatformFileFilterUPP = 
-                       NewFileFilterYDProc(CrossPlatformFileFilter);
-               #endif
-
-               ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
-               #if !TARGET_CARBON
-               DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
-               #endif
-               if ( reply.sfGood == false )
-               {
-                       m_path = "" ;
-                       return wxID_CANCEL ;
-               }
-               else
-               {
-                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
-                       return wxID_OK ;
-               }
-       }
-    return wxID_CANCEL;
-}
-       else
-#endif
-       {
-               NavDialogOptions                mNavOptions;
-               NavObjectFilterUPP              mNavFilterUPP = NULL;
-               NavPreviewUPP                   mNavPreviewUPP = NULL ;
-               NavReplyRecord                  mNavReply;
-               AEDesc                                  mDefaultLocation ;
-               bool                                    mSelectDefault = false ;
-               
-               ::NavGetDefaultDialogOptions(&mNavOptions);
-       
-               mNavFilterUPP   = nil;
-               mNavPreviewUPP  = nil;
-               mSelectDefault  = false;
-               mNavReply.validRecord                           = false;
-               mNavReply.replacing                                     = false;
-               mNavReply.isStationery                          = false;
-               mNavReply.translationNeeded                     = false;
-               mNavReply.selection.descriptorType = typeNull;
-               mNavReply.selection.dataHandle          = nil;
-               mNavReply.keyScript                                     = smSystemScript;
-               mNavReply.fileTranslation                       = nil;
-               
-               // Set default location, the location
-               //   that's displayed when the dialog
-               //   first appears
-               
-               FSSpec location ;
-               wxMacFilename2FSSpec( m_dir , &location ) ;
-               OSErr err = noErr ;
-               
-               mDefaultLocation.descriptorType = typeNull;
-               mDefaultLocation.dataHandle     = nil;
-
-               err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
-
-               if ( mDefaultLocation.dataHandle ) {
-                       
-                       if (mSelectDefault) {
-                               mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
-                       } else {
-                               mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
-                       }
-               }
-               
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)mNavOptions.message, m_message) ;
-#else
-               strcpy((char *)mNavOptions.message, m_message) ;
-               c2pstr((char *)mNavOptions.message ) ;
-#endif
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)mNavOptions.savedFileName, m_fileName) ;
-#else
-               strcpy((char *)mNavOptions.savedFileName, m_fileName) ;
-               c2pstr((char *)mNavOptions.savedFileName ) ;
-#endif
+    if (err == noErr)
+        err = ::NavDialogRun(dialog);

 
 

-               if ( m_dialogStyle & wxSAVE )
-               {
-                       
-                       mNavOptions.dialogOptionFlags |= kNavNoTypePopup ;
-                       mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
-                       mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;
-                       
-                       err = ::NavPutFile(
-                                               &mDefaultLocation,
-                                               &mNavReply,
-                                               &mNavOptions,
-                                               sStandardNavEventFilter ,
-                                               'TEXT',
-                                               'TEXT',
-                                               0L);                                    // User Data
-               }
-               else
-               {
-               OpenUserDataRec                 myData;
-               MakeUserDataRec( &myData , m_wildCard ) ;
-               NavTypeListHandle typelist = NULL ;
-
-               if ( myData.numfilters > 0 )
-               {
-                 mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.numfilters ) ;
-                 for ( int i = 0 ; i < myData.numfilters ; ++i ) {
-                   (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
-                   (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
-                   (*mNavOptions.popupExtension)[i].menuType = i ;
-          #if TARGET_CARBON
-                       c2pstrcpy((StringPtr)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ;
-          #else
-                       strcpy((char *)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ;
-                       c2pstr((char *)(*mNavOptions.popupExtension)[i].menuItemName ) ;
-          #endif
-                 }
-               }
-
-      mNavFilterUPP = NewNavObjectFilterProc( CrossPlatformFilterCallback ) ;
-                       if ( m_dialogStyle & wxMULTIPLE )
-                               mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
-                       else
-                               mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
-                       
-                       err = ::NavGetFile(
-                                               &mDefaultLocation,
-                                               &mNavReply,
-                                               &mNavOptions,
-                                               sStandardNavEventFilter ,
-                                               mNavPreviewUPP,
-                                               mNavFilterUPP,
-                                               typelist /*inFileTypes.TypeListHandle() */,
-                                               &myData);                                                       // User Data
-                       if ( typelist )
-                         DisposeHandle( (Handle) typelist ) ;
-               }
-               
-               DisposeNavObjectFilterUPP(mNavFilterUPP);
-               if ( mDefaultLocation.dataHandle != nil )
-               {
-                       ::AEDisposeDesc(&mDefaultLocation);
-               }
-               
-               if ( (err != noErr) && (err != userCanceledErr) ) {
-                       m_path = "" ;
-                       return wxID_CANCEL ;
-               }
-
-               if (mNavReply.validRecord) {
-               
-                       FSSpec  outFileSpec ;
-                       AEDesc specDesc ;
-                       
-                       long count ;
-                       ::AECountItems( &mNavReply.selection , &count ) ;
-                       for ( long i = 1 ; i <= count ; ++i )
-                       {
-                               OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, NULL , &specDesc);
-                               if ( err != noErr ) {
-                                       m_path = "" ;
-                                       return wxID_CANCEL ;
-                               }                       
-                               outFileSpec = **(FSSpec**) specDesc.dataHandle;
-                               if (specDesc.dataHandle != nil) {
-                                       ::AEDisposeDesc(&specDesc);
-                               }
-
-                                                               
-                               // outFolderDirID = thePB.dirInfo.ioDrDirID;
-                               m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;
-                               m_paths.Add( m_path ) ;
-                   m_fileNames.Add(m_fileName);
-                }
-                // set these to the first hit
-                m_path = m_paths[ 0 ] ;
-                m_fileName = wxFileNameFromPath(m_path);
-                m_dir = wxPathOnly(m_path);
-            
-                       return wxID_OK ;
-               }
-               return wxID_CANCEL;
-       }
-}
+    // clean up filter related data, etc.
+    if (navFilterUPP)
+        ::DisposeNavObjectFilterUPP(navFilterUPP);

 
 

-// Generic file load/save dialog
-static wxString
-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-  char *ext = (char *)extension;
-  
-  char prompt[50];
-  wxString str;
-  if (load)
-    str = "Load %s file";
-  else
-    str = "Save %s file";
-  sprintf(prompt, wxGetTranslation(str), what);
-
-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
-
-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
-}
+    if (err != noErr)
+        return wxID_CANCEL;

 
 

-// Generic file load dialog
-wxString
-wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-  return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
-}
+    NavReplyRecord navReply;
+    err = ::NavDialogGetReply(dialog, &navReply);
+    if (err == noErr && navReply.validRecord)
+    {
+        AEKeyword   theKeyword;
+        DescType    actualType;
+        Size        actualSize;
+        FSRef       theFSRef;
+        wxString thePath ;
+        long count;
+
+        m_filterIndex = myData.currentfilter;
+        ::AECountItems( &navReply.selection, &count );
+        for (long i = 1; i <= count; ++i)
+        {
+            err = ::AEGetNthPtr(
+                &(navReply.selection), i, typeFSRef, &theKeyword, &actualType,
+                &theFSRef, sizeof(theFSRef), &actualSize );
+            if (err != noErr)
+                break;
+
+            if (HasFdFlag(wxFD_SAVE))
+                thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
+            else
+                thePath = wxMacFSRefToPath( &theFSRef );
+
+            if (!thePath)
+            {
+                ::NavDisposeReply(&navReply);
+                return wxID_CANCEL;
+            }
+
+            m_path = thePath;
+            m_paths.Add(m_path);
+            m_fileName = wxFileNameFromPath(m_path);
+            m_fileNames.Add(m_fileName);
+        }

 
 

+        // set these to the first hit
+        m_path = m_paths[0];
+        m_fileName = wxFileNameFromPath(m_path);
+        m_dir = wxPathOnly(m_path);
+    }

 
 

-// Generic file save dialog
-wxString
-wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-  return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
+    ::NavDisposeReply(&navReply);
+
+    return (err == noErr) ? wxID_OK : wxID_CANCEL;

 }
 
 }
 

+#endif // wxUSE_FILEDLG