X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d4e4f802f8a165c8d41053d2cd6d33c32b08f79..613b6bb90a2345b7160dca1a72685c1ad19f3457:/src/mac/carbon/filedlg.cpp diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index 7e5ba852f4..0ff9c0e9dc 100644 --- a/src/mac/carbon/filedlg.cpp +++ b/src/mac/carbon/filedlg.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // 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 ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ #endif #if !USE_SHARED_LIBRARY -IMPLEMENT_CLASS(wxFileDialog, wxDialog) +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) #endif // begin wxmac @@ -52,301 +52,250 @@ extern bool gUseNavServices ; struct OpenUserDataRec { int currentfilter ; - bool saveMode ; + bool saveMode ; wxArrayString name ; wxArrayString extensions ; - wxArrayLong filtermactypes ; + wxArrayLong filtermactypes ; +#if TARGET_CARBON + CFArrayRef menuitems ; +#else NavMenuItemSpecArrayHandle menuitems ; +#endif }; 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); + static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc); #else - static NavEventUPP sStandardNavEventFilter = NewNavEventProc(NavEventProc); + static NavEventUPP sStandardNavEventFilter = NewNavEventProc(NavEventProc); #endif static pascal void NavEventProc( - NavEventCallbackMessage inSelector, - NavCBRecPtr ioParams, - NavCallBackUserData ioUserData ) + NavEventCallbackMessage inSelector, + NavCBRecPtr ioParams, + NavCallBackUserData ioUserData ) { - OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; - if (inSelector == kNavCBEvent) { + OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; + if (inSelector == kNavCBEvent) { +#if TARGET_CARBON +#else wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event); - } - else if ( inSelector == kNavCBStart ) - { - if ( data->menuitems ) - NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]); - } - else if ( inSelector == kNavCBPopupMenuSelect ) - { - NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ; - if ( menu->menuCreator == 'WXNG' ) - { - data->currentfilter = menu->menuType ; - if ( data->saveMode ) - { - int i = menu->menuType ; - wxString extension = data->extensions[i].AfterLast('.') ; - extension.MakeLower() ; - Str255 filename ; - // get the current filename - NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename); - CopyPascalStringToC( filename , (char*) filename ) ; - wxString sfilename( filename ) ; - int pos = sfilename.Find('.',TRUE) ; - if ( pos != wxNOT_FOUND ) - { - sfilename = sfilename.Left(pos+1)+extension ; - CopyCStringToPascal( sfilename.c_str() , filename ) ; - NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename); - } - } - } - } +#endif + } + else if ( inSelector == kNavCBStart ) + { +#if TARGET_CARBON +#else + if ( data->menuitems ) + NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]); +#endif + } + else if ( inSelector == kNavCBPopupMenuSelect ) + { + NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ; +#if TARGET_CARBON +#else + if ( menu->menuCreator == 'WXNG' ) +#endif + { + data->currentfilter = menu->menuType ; + if ( data->saveMode ) + { + int i = menu->menuType ; + wxString extension = data->extensions[i].AfterLast('.') ; + extension.MakeLower() ; + wxString sfilename ; + +#if TARGET_CARBON + wxMacCFStringHolder cfString = NavDialogGetSaveFileName( ioParams->context ) ; + sfilename = cfString.AsString() ; +#else + Str255 filename ; + // get the current filename + NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename); + sfilename = wxMacMakeStringFromPascal( filename ) ; +#endif + + int pos = sfilename.Find('.',TRUE) ; + if ( pos != wxNOT_FOUND ) + { + sfilename = sfilename.Left(pos+1)+extension ; +#if TARGET_CARBON + cfString = sfilename ; + NavDialogSetSaveFileName( ioParams->context , cfString ) ; +#else + wxMacStringToPascal( sfilename , filename ) ; + NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename); +#endif + } + } + } + } } -const char * gfilters[] = +const wxChar * gfilters[] = { - "*.TXT" , - "*.TIF" , - "*.JPG" , - - NULL + wxT("*.TXT") , + wxT("*.TIF") , + wxT("*.JPG") , + + NULL } ; OSType gfiltersmac[] = { - 'TEXT' , - 'TIFF' , - 'JPEG' , - - '****' + 'TEXT' , + 'TIFF' , + 'JPEG' , + + '****' } ; -void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) +void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) { - myData->menuitems = NULL ; - myData->currentfilter = 0 ; - myData->saveMode = 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++ ) + myData->menuitems = NULL ; + myData->currentfilter = 0 ; + myData->saveMode = FALSE ; + + if ( filter && filter[0] ) { - if( filter2.GetChar(i) == wxT('|') ) - { - if( isName ) { - myData->name.Add( current ) ; - } - else { - myData->extensions.Add( current.MakeUpper() ) ; - ++filterIndex ; + 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) ; + } } - isName = !isName ; - current = "" ; - } - 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 , "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() ) ; + // 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 ; + - ++filterIndex ; - - const size_t extCount = myData->extensions.GetCount(); - for ( size_t i = 0 ; i < extCount; i++ ) - { - int j ; - for ( j = 0 ; gfilters[j] ; j++ ) - { - if ( strcmp( myData->extensions[i] , gfilters[j] ) == 0 ) - { - myData->filtermactypes.Add( gfiltersmac[j] ) ; - break ; - } - } - if( gfilters[j] == NULL ) - { - myData->filtermactypes.Add( '****' ) ; - } - } - } + for ( size_t i = 0 ; i < extCount; i++ ) + { + int j ; + for ( j = 0 ; gfilters[j] ; j++ ) + { + if ( myData->extensions[i] == gfilters[j] ) + { + myData->filtermactypes.Add( gfiltersmac[j] ) ; + break ; + } + } + if( gfilters[j] == NULL ) + { + myData->filtermactypes.Add( '****' ) ; + } + } + } } -static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) +static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataRecPtr data) { - Str255 filename ; - -#if TARGET_CARBON - p2cstrcpy((char *)filename, name) ; -#else - PLstrcpy( filename , name ) ; - p2cstr( filename ) ; -#endif - wxString file(filename) ; + wxString file = filename ; file.MakeUpper() ; if ( data->extensions.GetCount() > 0 ) { - //for ( int i = 0 ; i < data->numfilters ; ++i ) - int i = data->currentfilter ; - if ( data->extensions[i].Right(2) == ".*" ) - return true ; - - { - if ( type == (OSType)data->filtermactypes[i] ) - return true ; - - wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ; - 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 ; + //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 ; } #ifndef __DARWIN__ 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) -{ - // 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 = ""; - - wxString defaultFilenameString; - if (defaultFileName) - defaultFilenameString = defaultFileName; - else - defaultFilenameString = ""; - - wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y)); +{ + OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; + // return true if this item is invisible or a file - if ( fileDialog.ShowModal() == wxID_OK ) + 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 ) { - strcpy(wxBuffer, (const char *)fileDialog.GetPath()); - return wxBuffer; - } - else - return wxGetEmptyString(); + wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ; + return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ; + } + + return false ; } +#endif -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) - -{ - wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "", - defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y)); - - if ( fileDialog.ShowModal() == wxID_OK ) - { - *defaultFilterIndex = fileDialog.GetFilterIndex(); - strcpy(wxBuffer, (const char *)fileDialog.GetPath()); - return wxBuffer; - } - else - return wxGetEmptyString(); -} +// 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) { - wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ; - m_message = message; - m_dialogStyle = style; - m_parent = parent; - m_path = ""; - m_fileName = defaultFileName; - m_dir = defaultDir; - m_wildCard = wildCard; - m_filterIndex = 0; + wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ; } - pascal Boolean CrossPlatformFilterCallback ( AEDesc *theItem, void *info, @@ -360,11 +309,27 @@ pascal Boolean CrossPlatformFilterCallback ( if (filterMode == kNavFilteringBrowserList) { NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ; - if (theItem->descriptorType == typeFSS && !theInfo->isFolder) + if ( !theInfo->isFolder ) { - FSSpec spec; - memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ; - display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; + 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 ) ; + } + #if TARGET_CARBON + else if ( theItem->descriptorType == typeFSRef ) + { + FSRef fsref ; + memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ; + wxString file ; + const short maxpath = 1024 ; + FSRefMakePath( &fsref , (UInt8*) file.GetWriteBuf(maxpath+1),maxpath) ; + file.UngetWriteBuf() ; + display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; + } +#endif } } @@ -373,81 +338,102 @@ pascal Boolean CrossPlatformFilterCallback ( int wxFileDialog::ShowModal() { - 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; - +#if TARGET_CARBON + NavDialogCreationOptions mNavOptions; + NavDialogRef navDialogRef = NULL ; +// since the same field has been renamed ... +#define dialogOptionFlags optionFlags +#else + NavDialogOptions mNavOptions; +#endif + NavObjectFilterUPP mNavFilterUPP = NULL; + NavPreviewUPP mNavPreviewUPP = NULL ; + NavReplyRecord mNavReply; + AEDesc mDefaultLocation ; + bool mSelectDefault = false ; + OSStatus err = noErr ; + // setup dialog + + mNavFilterUPP = nil; + mNavPreviewUPP = nil; + mSelectDefault = false; + mDefaultLocation.descriptorType = typeNull; + mDefaultLocation.dataHandle = nil; + +#if TARGET_CARBON + NavGetDefaultDialogCreationOptions( &mNavOptions ) ; + wxMacCFStringHolder cfMessage(m_message) ; + wxMacCFStringHolder cfFileName(m_fileName) ; + mNavOptions.saveFileName = cfFileName ; + mNavOptions.message = cfMessage ; +#else + NavGetDefaultDialogOptions(&mNavOptions); + wxMacStringToPascal( m_message , (StringPtr)mNavOptions.message ) ; + wxMacStringToPascal( m_fileName , (StringPtr)mNavOptions.savedFileName ) ; + // 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 - OpenUserDataRec myData; + memset( &mNavReply , 0 , sizeof( mNavReply ) ) ; + 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; + mNavReply.version = kNavReplyRecordVersion ; + + // zero all data + + m_path = wxEmptyString ; + m_fileName = wxEmptyString ; + m_paths.Empty(); + m_fileNames.Empty(); + + OpenUserDataRec myData; MakeUserDataRec( &myData , m_wildCard ) ; myData.currentfilter = m_filterIndex ; if ( myData.extensions.GetCount() > 0 ) { +#if TARGET_CARBON + CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault , + myData.extensions.GetCount() , &kCFTypeArrayCallBacks ) ; + mNavOptions.popupExtension = popup ; + myData.menuitems = mNavOptions.popupExtension ; + for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i ) + { + CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ; + } +#else mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ; myData.menuitems = mNavOptions.popupExtension ; for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i ) { (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ; (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ; + // TODO : according to the new docs -1 to 10 are reserved for the OS (*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 + wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ; } +#endif } if ( m_dialogStyle & wxSAVE ) { @@ -455,7 +441,20 @@ int wxFileDialog::ShowModal() mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ; mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ; - + +#if TARGET_CARBON + err = NavCreatePutFileDialog( &mNavOptions , NULL , kNavGenericSignature , sStandardNavEventFilter , + &myData , &navDialogRef ) ; + if ( err == noErr ) + { + err = NavDialogRun( navDialogRef ) ; + NavUserAction userAction = NavDialogGetUserAction( navDialogRef ) ; + if ( userAction != kNavUserActionCancel && userAction != kNavUserActionNone ) + { + NavDialogGetReply( navDialogRef, &mNavReply ) ; + } + } +#else err = ::NavPutFile( &mDefaultLocation, &mNavReply, @@ -463,7 +462,8 @@ int wxFileDialog::ShowModal() sStandardNavEventFilter , NULL, kNavGenericSignature, - &myData); // User Data + &myData); // User Data +#endif m_filterIndex = myData.currentfilter ; } else @@ -475,7 +475,20 @@ int wxFileDialog::ShowModal() mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ; else mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ; - + +#if TARGET_CARBON + err = NavCreateGetFileDialog( &mNavOptions , NULL , sStandardNavEventFilter , + mNavPreviewUPP , mNavFilterUPP , &myData , &navDialogRef ) ; + if ( err == noErr ) + { + err = NavDialogRun( navDialogRef ) ; + NavUserAction userAction = NavDialogGetUserAction( navDialogRef ) ; + if ( userAction != kNavUserActionCancel && userAction != kNavUserActionNone ) + { + NavDialogGetReply( navDialogRef, &mNavReply ) ; + } + } +#else err = ::NavGetFile( &mDefaultLocation, &mNavReply, @@ -485,40 +498,47 @@ int wxFileDialog::ShowModal() mNavFilterUPP, NULL , &myData); +#endif m_filterIndex = myData.currentfilter ; } - + 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 ; AEKeyword keyWord ; - + long count ; ::AECountItems( &mNavReply.selection , &count ) ; for ( long i = 1 ; i <= count ; ++i ) { OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc); if ( err != noErr ) { - m_path = "" ; + m_path = wxT("") ; return wxID_CANCEL ; - } + } outFileSpec = **(FSSpec**) specDesc.dataHandle; if (specDesc.dataHandle != nil) { ::AEDisposeDesc(&specDesc); } m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ; +#if TARGET_CARBON + if ( m_dialogStyle & wxSAVE ) + { + wxMacCFStringHolder cfString = NavDialogGetSaveFileName( navDialogRef ) ; + m_path += wxFILE_SEP_PATH + cfString.AsString() ; + } +#endif m_paths.Add( m_path ) ; m_fileName = wxFileNameFromPath(m_path); m_fileNames.Add(m_fileName); @@ -528,45 +548,16 @@ int wxFileDialog::ShowModal() m_fileName = wxFileNameFromPath(m_path); m_dir = wxPathOnly(m_path); NavDisposeReply( &mNavReply ) ; +#if TARGET_CARBON + if ( navDialogRef ) + NavDialogDispose( navDialogRef ) ; +#endif return wxID_OK ; } +#if TARGET_CARBON + if ( navDialogRef ) + NavDialogDispose( navDialogRef ) ; +#endif return wxID_CANCEL; } -// 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); -} - -// 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); -} - - -// 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); -} - -