X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/169935ad4ed842421ef24470a06d1aa298f90fbe..0c718eb7e0362e7df346a97c66478877cacdc8ad:/src/mac/carbon/filedlg.cpp

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index ba8ad73df7..6abb80c8d7 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.cpp
-// Purpose:     wxFileDialog
+// Purpose:     wxFileDialog 
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -14,16 +14,462 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 
+#ifndef __DARWIN__
+  #include "PLStringFuncs.h"
+#endif
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #endif
 
-WXDLLEXPORT wxString wxFileSelector(const char *title,
+// begin wxmac
+
+#ifndef __DARWIN__
+  #include <Navigation.h>
+#endif
+
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"
+
+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)
+// 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 ;
+};
+typedef struct OpenUserDataRec
+	OpenUserDataRec, *OpenUserDataRecPtr;
+
+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 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 ;
+	}
+}
+
+char * gfilters[] =
+{
+	"*.TXT" ,
+	"*.TIF" ,
+	"*.JPG" ,
+	
+	NULL 
+} ;
+
+OSType gfiltersmac[] =
+{
+	'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; 
+}
+
+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) 	;
+}
+
+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
+};
+
+static void GetLabelString(StringPtr theStr, short stringNum)
+{
+	GetIndString(theStr, kStrListID, stringNum);
+}
+
+static void CopyPStr(StringPtr src, StringPtr dest)
+{
+	BlockMoveData(src, dest, 1 + src[0]);
+}
+
+static char GetSelectKey(void)
+{
+	// this is the key used to trigger the select button
+	
+	// NOT INTERNATIONAL SAVVY; should at least grab it from resources
+	
+	return 's';
+}
+
+// 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)
+{
+	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
+
+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
+
+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 )
+    {
+      wxASSERT_MSG( !isName , "incorrect format of format string" ) ;
+      myData->extensions[filterIndex] = current.MakeUpper() ;
+      ++filterIndex ;
+    }
+
+		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 ;
+	}
+
+}
+
+#if !TARGET_CARBON
+void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
+{
+	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
+
+	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;
+			}
+		}
+	}
+}
+#endif
+
+static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
+{
+    Str255 			filename ;
+    
+#if TARGET_CARBON
+    p2cstrcpy((char *)filename, name) ;
+#else
+    PLstrcpy( filename , name ) ;
+    p2cstr( filename ) ;
+#endif
+    wxString file(filename) ;
+    file.MakeUpper() ;
+    
+    if ( data->numfilters > 0 )
+    {
+	//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 ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+		return true ;
+	}
+	return false ;
+    }
+    return true ;
+}
+
+#if !TARGET_CARBON
+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 ;
+}
+#endif
+
+// 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)
@@ -57,7 +503,7 @@ WXDLLEXPORT wxString wxFileSelector(const char *title,
         return wxBuffer;
     }
     else
-        return NULL;
+        return wxGetEmptyString();
 }
 
 WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
@@ -81,7 +527,7 @@ WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
         return wxBuffer;
     }
     else
-        return NULL;
+        return wxGetEmptyString();
 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
@@ -98,11 +544,255 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     m_filterIndex = 1;
 }
 
+
+pascal 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;
+#if TARGET_CARBON
+		  ::AEGetDescData(theItem, &spec, sizeof(FSSpec) ) ;
+#else
+		  memcpy( &spec , (*theItem->dataHandle) , sizeof(FSSpec) ) ;
+#endif
+		  display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+		}
+	}
+
+	return display;
+}
+
 int wxFileDialog::ShowModal()
 {
-    // TODO
+#if !TARGET_CARBON
+	if ( !gUseNavServices )
+	{
+	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 = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
+			return wxID_OK ;
+		}
+	}
+	else
+	{
+		OSType types = '????' ;
+		Str255				prompt ;
+		Str255				path ;
+
+		strcpy((char *)prompt, m_message) ;
+		c2pstr((char *)prompt ) ;
+		strcpy((char *)path, m_dir ) ;
+		c2pstr((char *)path ) ;
+
+		StandardFileReply	reply ;
+		FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
+		crossPlatformFileFilterUPP = 
+			NewFileFilterYDProc(CrossPlatformFileFilter);
+		ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
+		DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
+		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 ( 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 = NewNavObjectFilterUPP( 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;
+	}
+}
 
 // Generic file load/save dialog
 static wxString