// 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/tokenzr.h"
#include "wx/filename.h"
-#ifndef __DARWIN__
- #include "PLStringFuncs.h"
-#endif
+#include "wx/mac/private.h"
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+#ifndef __DARWIN__
+ #include <Navigation.h>
+ #include "PLStringFuncs.h"
#endif
-// begin wxmac
-
-#include "wx/mac/private.h"
-
-#include <Navigation.h>
+#include "MoreFilesX.h"
-#ifdef __DARWIN__
-# include "MoreFilesX.h"
-#else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-#endif
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
-extern bool gUseNavServices ;
+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
// and a copy of the "previous" file spec of the reply record
// so we can see if the selection has changed
-struct OpenUserDataRec {
+struct OpenUserDataRec
+{
int currentfilter ;
bool saveMode ;
wxArrayString name ;
wxArrayString extensions ;
wxArrayLong filtermactypes ;
wxString defaultLocation;
-#if TARGET_CARBON
CFArrayRef menuitems ;
-#else
- NavMenuItemSpecArrayHandle menuitems ;
-#endif
};
typedef struct OpenUserDataRec
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) {
-#if TARGET_CARBON
-#else
- wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
-#endif
+ if (inSelector == kNavCBEvent)
+ {
}
else if ( inSelector == kNavCBStart )
{
-#if TARGET_CARBON
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};
+ AEDesc theLocation = { typeNull, NULL };
if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
}
menuItem.menuType = data->currentfilter;
wxMacStringToPascal( data->name[data->currentfilter] , (StringPtr)(menuItem.menuItemName) ) ;
::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
-
-#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
const size_t numFilters = data->extensions.GetCount();
if ( menu->menuType < numFilters )
-#else
- if ( menu->menuCreator == 'WXNG' )
-#endif
{
data->currentfilter = menu->menuType ;
if ( data->saveMode )
extension.MakeLower() ;
wxString sfilename ;
-#if TARGET_CARBON
wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false );
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.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;
NavDialogSetSaveFileName( ioParams->context , cfString ) ;
-#else
- wxMacStringToPascal( sfilename , filename ) ;
- NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
-#endif
}
}
}
}
}
-
-void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
+void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
{
myData->menuitems = NULL ;
myData->currentfilter = 0 ;
int filterIndex = 0;
bool isName = true ;
wxString current ;
- for( unsigned int i = 0; i < filter2.Len() ; i++ )
+
+ for ( unsigned int i = 0; i < filter2.Len() ; i++ )
{
- if( filter2.GetChar(i) == wxT('|') )
+ if ( filter2.GetChar(i) == wxT('|') )
{
- if( isName ) {
+ if ( isName )
+ {
myData->name.Add( current ) ;
}
- else {
+ else
+ {
myData->extensions.Add( current.MakeUpper() ) ;
++filterIndex ;
}
+
isName = !isName ;
current = wxEmptyString ;
}
const size_t extCount = myData->extensions.GetCount();
for ( size_t i = 0 ; i < extCount; i++ )
{
- wxUint32 fileType;
- wxUint32 creator;
+ wxUint32 fileType, creator;
wxString extension = myData->extensions[i];
+ // Remove leading '*'
if (extension.GetChar(0) == '*')
- extension = extension.Mid(1); // Remove leading *
+ extension = extension.Mid( 1 );
+ // Remove leading '.'
if (extension.GetChar(0) == '.')
- {
- extension = extension.Mid(1); // Remove leading .
- }
+ 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
- }
+ myData->filtermactypes.Add( '****' ); // We'll fail safe if it's not recognized
}
}
}
return true ;
wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
- while( tokenizer.HasMoreTokens() )
+ while ( tokenizer.HasMoreTokens() )
{
wxString extension = tokenizer.GetNextToken() ;
if ( extension.GetChar(0) == '*' )
return true ;
}
}
+
return false ;
}
+
return true ;
}
-#ifndef __DARWIN__
+#if !TARGET_API_MAC_OSX
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
// 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)
+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() , wxT("Navigation Services are not running") ) ;
}
-pascal Boolean CrossPlatformFilterCallback (
+pascal Boolean CrossPlatformFilterCallback(
AEDesc *theItem,
void *info,
void *callBackUD,
- NavFilterModes filterMode
-)
+ NavFilterModes filterMode )
{
bool display = true;
OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
if ( !theInfo->isFolder )
{
- if (theItem->descriptorType == typeFSS )
+ 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) ) ;
-
-
-
- CFURLRef fullURLRef;
- fullURLRef = ::CFURLCreateFromFSRef(NULL, &fsref);
-#ifdef __UNIX__
- CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
-#else
- CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
-#endif
- CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
- ::CFRelease( fullURLRef ) ;
- wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding());
-
+ wxString file = wxMacFSRefToPath( &fsref ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
}
-#endif
}
}
int wxFileDialog::ShowModal()
{
-#if TARGET_CARBON
OSErr err;
NavDialogCreationOptions dialogCreateOptions;
+
// set default options
::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
{
myData.saveMode = true;
- if (!numFilters)
- {
- dialogCreateOptions.optionFlags |= kNavNoTypePopup;
- }
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
+ if (!numFilters)
+ dialogCreateOptions.optionFlags |= kNavNoTypePopup;
// The extension is important
- dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
-
- err = ::NavCreatePutFileDialog(&dialogCreateOptions,
- // Suppresses the 'Default' (top) menu item
- kNavGenericSignature, kNavGenericSignature,
- sStandardNavEventFilter,
- &myData, // for defaultLocation
- &dialog);
+ if (numFilters < 2)
+ dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
+
+#if TARGET_API_MAC_OSX
+ if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+ dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
+#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);
+ err = ::NavCreateGetFileDialog(
+ &dialogCreateOptions,
+ NULL, // NavTypeListHandle
+ sStandardNavEventFilter,
+ NULL, // NavPreviewUPP
+ navFilterUPP,
+ (void *) &myData, // inClientData
+ &dialog );
}
if (err == noErr)
Size actualSize;
FSRef theFSRef;
wxString thePath ;
-
- m_filterIndex = myData.currentfilter ;
-
long count;
- ::AECountItems(&navReply.selection , &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);
+ err = ::AEGetNthPtr(
+ &(navReply.selection), i, typeFSRef, &theKeyword, &actualType,
+ &theFSRef, sizeof(theFSRef), &actualSize );
if (err != noErr)
break;
- CFURLRef fullURLRef = 0 ;
if (m_dialogStyle & wxSAVE)
- {
- CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
-
- if (parentURLRef)
- {
- fullURLRef =
- ::CFURLCreateCopyAppendingPathComponent(NULL,
- parentURLRef,
- navReply.saveFileName,
- false);
- ::CFRelease(parentURLRef);
- }
- }
+ thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
else
- {
- fullURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
- }
-#ifdef __UNIX__
- CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
-#else
- CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
-#endif
- CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
- thePath = wxMacCFStringHolder(cfString).AsString(m_font.GetEncoding());
+ 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;
-#else // TARGET_CARBON
-
- NavDialogOptions mNavOptions;
- 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;
-
- 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 ) ;
-
- err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
-
- if ( mDefaultLocation.dataHandle )
- {
- if (mSelectDefault)
- {
- mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
- } else {
- mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
- }
- }
-
- 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 )
- {
- 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 ;
- wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ;
- }
- }
- if ( m_dialogStyle & wxSAVE )
- {
- myData.saveMode = true ;
-
- mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
- mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;
-
- err = ::NavPutFile(
- &mDefaultLocation,
- &mNavReply,
- &mNavOptions,
- sStandardNavEventFilter ,
- NULL,
- kNavGenericSignature,
- &myData); // User Data
- m_filterIndex = myData.currentfilter ;
- }
- else
- {
- myData.saveMode = false ;
-
- mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;
- if ( m_dialogStyle & wxMULTIPLE )
- mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
- else
- mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
-
- err = ::NavGetFile(
- &mDefaultLocation,
- &mNavReply,
- &mNavOptions,
- sStandardNavEventFilter ,
- mNavPreviewUPP,
- mNavFilterUPP,
- NULL ,
- &myData);
- m_filterIndex = myData.currentfilter ;
- }
-
- DisposeNavObjectFilterUPP(mNavFilterUPP);
- if ( mDefaultLocation.dataHandle != nil )
- {
- ::AEDisposeDesc(&mDefaultLocation);
- }
-
- if ( (err != noErr) && (err != userCanceledErr) ) {
- 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 = wxT("") ;
- return wxID_CANCEL ;
- }
- outFileSpec = **(FSSpec**) specDesc.dataHandle;
- if (specDesc.dataHandle != nil) {
- ::AEDisposeDesc(&specDesc);
- }
- m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;
-
- 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( &mNavReply ) ;
- return wxID_OK ;
- }
- return wxID_CANCEL;
-#endif // TARGET_CARBON
}
projects / wxWidgets.git / blobdiff