X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..2ddb4d13585d5235556119fb1937273da9e433a3:/src/mac/carbon/filedlg.cpp

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 66de687b80..dcd709aef4 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,103 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.cpp
 // Purpose:     wxFileDialog
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "filedlg.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
+#include "wx/tokenzr.h"
+#include "wx/filename.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
+#ifndef __DARWIN__
+  #include "PLStringFuncs.h"
 #endif
 
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+
 // begin wxmac
 
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
-#include "PLStringFuncs.h"
+#include "wx/mac/private.h"
 
-char * gfilters[] =
-{
-	"*.TXT" ,
-	
-	NULL 
-} ;
-
-OSType gfiltersmac[] =
-{
-	'TEXT' ,
-	
-	'****'
-} ;
-
-static void wxMacSetupStandardFile(short newVRefNum, long newDirID) 
-{ 
-	enum 
-	{ SFSaveDisk = 0x214, CurDirStore = 0x398 };
-	*(short *) SFSaveDisk = -1 * newVRefNum; 
-	*(long *) CurDirStore = newDirID; 
-}
+#ifndef __DARWIN__
+#include <Navigation.h>
+#endif
 
-static void wxMacSetupStandardFileFromPath( const char* s )
-{
-	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) 	;
-}
+#include "MoreFilesX.h"
 
-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
-};
+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
@@ -105,438 +43,399 @@ enum {
 // 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 {
-	StandardFileReply	*sfrPtr;
-	FSSpec				oldSelectionFSSpec;
-	char				filter[kwxMacFileTypes][10] ;
-	OSType				filtermactypes[kwxMacFileTypes] ;
-	int					numfilters ;
-	DialogPtr			theDlgPtr;
+  int                currentfilter ;
+  bool               saveMode ;
+  wxArrayString      name ;
+  wxArrayString      extensions ;
+  wxArrayLong        filtermactypes ;
+  wxString           defaultLocation;
+  CFArrayRef         menuitems ;
 };
+
 typedef struct OpenUserDataRec
-	OpenUserDataRec, *OpenUserDataRecPtr;
+OpenUserDataRec, *OpenUserDataRecPtr;
 
-static void GetLabelString(StringPtr theStr, short stringNum)
-{
-	GetIndString(theStr, kStrListID, stringNum);
-}
+static pascal void    NavEventProc(
+                                NavEventCallbackMessage        inSelector,
+                                NavCBRecPtr                    ioParams,
+                                NavCallBackUserData            ioUserData);
 
-static void CopyPStr(StringPtr src, StringPtr dest)
-{
-	BlockMoveData(src, dest, 1 + src[0]);
-}
+static NavEventUPP    sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
 
-static char GetSelectKey(void)
+static pascal void
+NavEventProc(
+    NavEventCallbackMessage        inSelector,
+    NavCBRecPtr                    ioParams,
+    NavCallBackUserData    ioUserData    )
 {
-	// this is the key used to trigger the select button
-	
-	// NOT INTERNATIONAL SAVVY; should at least grab it from resources
-	
-	return 's';
+    OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
+    if (inSelector == kNavCBEvent) {
+    }
+    else if ( inSelector == kNavCBStart )
+    {
+        if (data && !(data->defaultLocation).IsEmpty())
+        {
+            // Set default location for the modern Navigation APIs
+            // Apple Technical Q&A 1151
+            FSSpec theFSSpec;
+            wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec);
+            AEDesc theLocation = {typeNull, NULL};
+            if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &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 ;
+                wxString extension =  data->extensions[i].AfterLast('.') ;
+                extension.MakeLower() ;
+                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 ) ;
+                }
+            }
+        }
+    }
 }
 
-// FlashButton briefly highlights the dialog button 
-// as feedback for key equivalents
-
-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);
-}
 
-static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2)
+void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
 {
-	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
+    myData->menuitems = NULL ;
+    myData->currentfilter = 0 ;
+    myData->saveMode = false ;
 
-static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
-											short *item, Ptr 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;
+    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.Add( current ) ;
+                }
+                else {
+                    myData->extensions.Add( current.MakeUpper() ) ;
+                    ++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.IsEmpty() )
+            myData->extensions.Add( myData->name[filterIndex] ) ;
+        else
+            myData->extensions.Add( current.MakeUpper() ) ;
+        if ( filterIndex == 0 || isName )
+            myData->name.Add( current.MakeUpper() ) ;
+
+        ++filterIndex ;
+
+        const size_t extCount = myData->extensions.GetCount();
+        for ( size_t i = 0 ; i < extCount; i++ )
+        {
+            wxUint32 fileType;
+            wxUint32 creator;
+            wxString extension = myData->extensions[i];
+
+            if (extension.GetChar(0) == '*')
+                extension = extension.Mid(1);	// Remove leading *
+
+            if (extension.GetChar(0) == '.')
+            {
+                extension = extension.Mid(1);	// Remove leading .
+            }
+       
+            if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
+            {
+                myData->filtermactypes.Add( (OSType)fileType );
+            }
+            else
+            {
+                myData->filtermactypes.Add( '****' ) ;		// We'll fail safe if it's not recognized
+        	}
+        }
+    }
 }
 
-void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR)
+static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataRecPtr data)
 {
-	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
-	
-	CopyPStr("\p ", theSFR->sfFile.name);
-	
-	// point the user data parameter at the reply record so we can get to it later
-	
-	myData.sfrPtr = theSFR;
-	if ( filter && filter[0] )
-	{
-		myData.numfilters = 1 ;
-		for ( int i = 0 ; i < myData.numfilters ; i++ )
-		{
-			int j ;
-			
-			strcpy( myData.filter[i] , filter ) ;
-			for( j = 0 ; myData.filter[i][j] ; j++ )
-			{
-				myData.filter[i][j] = toupper( myData.filter[i][j] ) ;
-			}
-			for ( j = 0 ; gfilters[j] ; j++ )
-			{
-				if ( strcmp( myData.filter[i] , gfilters[j] ) == 0 )
-				{
-					myData.filtermactypes[i] = gfiltersmac[j] ;
-					break ;
-				}
-			}
-			if( gfilters[j] == NULL )
-			{
-				myData.filtermactypes[i] = '****' ;
-			}
-		}
-	}
-	else
-	{
-		myData.numfilters = 0 ;
-	}
-	// display the dialog
-	
-	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);
-	
-	// 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;
-			}
-		}
-	}
-}
+    wxString file(filename) ;
+    file.MakeUpper() ;
 
-static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr)
-{	
-	Str255 			filename ;
-	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 )
-	{
-		if ( data->numfilters > 0 )
-		{
-			PLstrcpy( filename ,myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
-			if ( filename[0] >= 4 )
-			{
-				for( int j = 1 ; j <= filename[0] ; j++ )
-				{
-					filename[j] = toupper( filename[j] ) ;
-				}
-				for ( int i = 0 ; i < data->numfilters ; ++i )
-				{
-					if ( myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType == data->filtermactypes[i] )
-						return false ;
-
-					if ( strncmp( (char*) filename + 1 + filename[0] - 4 , 
-							& data->filter[i][ strlen(data->filter[i]) - 4 ] , 4 ) == 0 )
-							return false ;
-				}
-			}
-			return true ;				
-		}
-	}	
-		
-	return 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) ;
+
+                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                    return true ;
+            }
+        }
+        return false ;
+    }
+    return true ;
 }
 
-// end wxmac
-
-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)
+#if !TARGET_API_MAC_OSX
+static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {
-    // 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 = "";
+    OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
+    // return true if this item is invisible or a file
 
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-    else
-        defaultFilenameString = "";
-
-    wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
+    Boolean visibleFlag;
+    Boolean folderFlag;
 
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
-    }
-    else
-        return wxGetEmptyString();
-}
+    visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible);
+    folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10);
 
-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)
+    // because the semantics of the filter proc are "true means don't show
+    // it" we need to invert the result that we return
 
-{
-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
+    if ( !visibleFlag )
+        return true ;
 
-    if ( fileDialog.ShowModal() == wxID_OK )
+    if ( !folderFlag )
     {
-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
+        return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
     }
-    else
-        return wxGetEmptyString();
+
+    return false ;
 }
+#endif
+
+// end wxmac
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
         long style, const wxPoint& pos)
+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
 {
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-    m_path = "";
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_filterIndex = 1;
+    wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 
-int wxFileDialog::ShowModal()
+pascal Boolean CrossPlatformFilterCallback (
+    AEDesc *theItem,
+    void *info,
+    void *callBackUD,
+    NavFilterModes filterMode
+)
 {
-	if ( m_dialogStyle & wxSAVE )
-	{
-		StandardFileReply	reply ;
-		Str255				prompt ;
-		Str255				filename ;
-
-		strcpy((char *)prompt, m_message) ;
-		c2pstr((char *)prompt ) ;
-	
-		strcpy((char *)filename, m_fileName) ;
-		c2pstr((char *)filename ) ;
-		
-		StandardPutFile( prompt , filename , &reply ) ;
-		if ( reply.sfGood == false )
-		{
-			m_path = "" ;
-			return wxID_CANCEL ;
-		}
-		else
-		{
-			m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
-			return wxID_OK ;
-		}
-	}
-	else
-	{
-		OSType types = '????' ;
-		Str255				prompt ;
-		Str255				path ;
-
-		strcpy((char *)prompt, m_message) ;
-		c2pstr((char *)prompt ) ;
-	
-		strcpy((char *)path, m_path ) ;
-		c2pstr((char *)path ) ;
-
-		FileFilterYDUPP 	crossPlatformFileFilterUPP;
-		StandardFileReply	reply ;
-		crossPlatformFileFilterUPP = 
-			NewFileFilterYDProc(CrossPlatformFileFilter);
-
-		ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
-	
-		DisposeRoutineDescriptor(crossPlatformFileFilterUPP);
-		if ( reply.sfGood == false )
-		{
-			m_path = "" ;
-			return wxID_CANCEL ;
-		}
-		else
-		{
-			m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
-			return wxID_OK ;
-		}
-	}
-    return wxID_CANCEL;
-}
+    bool display = true;
+    OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
 
-// 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 (filterMode == kNavFilteringBrowserList)
+    {
+        NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
+        if ( !theInfo->isFolder )
+        {
+            if (theItem->descriptorType == typeFSS )
+            {
+                FSSpec    spec;
+                memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
+                wxString file = wxMacMakeStringFromPascal( spec.name ) ;
+                display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+            }
+            else if ( theItem->descriptorType == typeFSRef )
+            {
+                FSRef fsref ;
+                memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;
+                wxString file = wxMacFSRefToPath( &fsref ) ;
+                display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+            }
+        }
+    }
+
+    return display;
 }
 
-// Generic file load dialog
-wxString
-wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+int wxFileDialog::ShowModal()
 {
-  return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
-}
+    OSErr err;
+    NavDialogCreationOptions dialogCreateOptions;
+    // set default options
+    ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
 
+    // this was always unset in the old code
+    dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;
 
-// 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);
-}
+    wxMacCFStringHolder message(m_message, m_font.GetEncoding());
+    dialogCreateOptions.windowTitle = message;
+
+    wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
+    dialogCreateOptions.saveFileName = defaultFileName;
 
 
+    NavDialogRef dialog;
+    NavObjectFilterUPP navFilterUPP = NULL;
+    CFArrayRef cfArray = NULL; // for popupExtension
+    OpenUserDataRec myData;
+    myData.defaultLocation = m_dir;
+
+    MakeUserDataRec(&myData , m_wildCard);
+    myData.currentfilter = m_filterIndex;
+    size_t numFilters = myData.extensions.GetCount();
+    if (numFilters)
+    {
+        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() ) ) ;
+        }
+    }
+
+    if (m_dialogStyle & wxSAVE)
+    {
+        myData.saveMode = true;
+
+        if (!numFilters)
+        {
+            dialogCreateOptions.optionFlags |= kNavNoTypePopup;
+        }
+        dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
+        dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
+
+        // The extension is important
+        if (numFilters < 2)
+            dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
+
+#if TARGET_API_MAC_OSX
+        if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+        {
+	        dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
+        }
+#endif
+        err = ::NavCreatePutFileDialog(&dialogCreateOptions,
+                                       // Suppresses the 'Default' (top) menu item
+                                       kNavGenericSignature, kNavGenericSignature,
+                                       sStandardNavEventFilter,
+                                       &myData, // for defaultLocation
+                                       &dialog);
+    }
+    else
+    {
+    
+        //let people select bundles/programs in dialogs
+        dialogCreateOptions.optionFlags |= kNavSupportPackages;
+    
+        navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
+        err = ::NavCreateGetFileDialog(&dialogCreateOptions,
+                                       NULL, // NavTypeListHandle
+                                       sStandardNavEventFilter,
+                                       NULL, // NavPreviewUPP
+                                       navFilterUPP,
+                                       (void *) &myData, // inClientData
+                                       &dialog);
+    }
+
+    if (err == noErr)
+        err = ::NavDialogRun(dialog);
+
+    // clean up filter related data, etc.
+    if (navFilterUPP)
+        ::DisposeNavObjectFilterUPP(navFilterUPP);
+    if (cfArray)
+        ::CFRelease(cfArray);
+
+    if (err != noErr)
+        return wxID_CANCEL;
+
+    NavReplyRecord navReply;
+    err = ::NavDialogGetReply(dialog, &navReply);
+    if (err == noErr && navReply.validRecord)
+    {
+        AEKeyword   theKeyword;
+        DescType    actualType;
+        Size        actualSize;
+        FSRef       theFSRef;
+        wxString thePath ;
+
+        m_filterIndex = myData.currentfilter ;
+
+        long count;
+        ::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 (m_dialogStyle & wxSAVE)
+                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);
+    }
+    ::NavDisposeReply(&navReply);
+
+    return (err == noErr) ? wxID_OK : wxID_CANCEL;
+}
+