// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "filedlg.h"
#endif
-#include "wx/defs.h"
+#include "wx/wxprec.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"
#ifndef __DARWIN__
#include "PLStringFuncs.h"
#include <Navigation.h>
-#ifdef __DARWIN__
-# include "MoreFilesX.h"
-#else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-#endif
+#include "MoreFilesX.h"
extern bool gUseNavServices ;
wxArrayString extensions ;
wxArrayLong filtermactypes ;
wxString defaultLocation;
-#if TARGET_CARBON
CFArrayRef menuitems ;
-#else
- NavMenuItemSpecArrayHandle menuitems ;
-#endif
};
typedef struct OpenUserDataRec
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(
{
OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
if (inSelector == kNavCBEvent) {
-#if TARGET_CARBON
-#else
- wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
-#endif
}
else if ( inSelector == kNavCBStart )
{
-#if TARGET_CARBON
if (data && !(data->defaultLocation).IsEmpty())
{
// Set default location for the modern Navigation APIs
if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
}
-#else
- if ( data->menuitems )
- NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]);
-#endif
+
+ 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 ;
-#if TARGET_CARBON
-#else
- if ( menu->menuCreator == 'WXNG' )
-#endif
+ const size_t numFilters = data->extensions.GetCount();
+
+ if ( menu->menuType < numFilters )
{
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 = sfilename ;
+ cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;
NavDialogSetSaveFileName( ioParams->context , cfString ) ;
-#else
- wxMacStringToPascal( sfilename , filename ) ;
- NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
-#endif
}
}
}
}
}
-const wxChar * gfilters[] =
-{
- wxT("*.TXT") ,
- wxT("*.TIF") ,
- wxT("*.JPG") ,
-
- NULL
-} ;
-
-OSType gfiltersmac[] =
-{
- 'TEXT' ,
- 'TIFF' ,
- 'JPEG' ,
-
- '****'
-} ;
-
void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
{
const size_t extCount = myData->extensions.GetCount();
for ( size_t i = 0 ; i < extCount; i++ )
{
- int j ;
- for ( j = 0 ; gfilters[j] ; j++ )
+ wxUint32 fileType;
+ wxUint32 creator;
+ wxString extension = myData->extensions[i];
+
+ if (extension.GetChar(0) == '*')
+ extension = extension.Mid(1); // Remove leading *
+
+ if (extension.GetChar(0) == '.')
{
- if ( myData->extensions[i] == gfilters[j] )
- {
- myData->filtermactypes.Add( gfiltersmac[j] ) ;
- break ;
- }
+ extension = extension.Mid(1); // Remove leading .
}
- if( gfilters[j] == NULL )
+
+ if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
{
- myData->filtermactypes.Add( '****' ) ;
+ myData->filtermactypes.Add( (OSType)fileType );
}
+ else
+ {
+ myData->filtermactypes.Add( '****' ) ; // We'll fail safe if it's not recognized
+ }
}
}
}
return true ;
}
-#ifndef __DARWIN__
+#if !TARGET_API_MAC_OSX
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
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() ;
+ 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
// this was always unset in the old code
dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;
-#if wxUSE_UNICODE
- // tried using wxMacCFStringHolder in the code below, but it seems
- // the CFStrings were being released before the save dialog was called,
- // causing a crash - open dialog works fine with or without wxMacCFStringHolder
- CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
- m_message.wc_str(),
- kCFStringEncodingUnicode);
-#else
- CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
- m_message.c_str(),
- CFStringGetSystemEncoding());
-#endif
- dialogCreateOptions.windowTitle = titleRef;
-#if wxUSE_UNICODE
- CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
- m_fileName.wc_str(),
- kCFStringEncodingUnicode);
-#else
- CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
- m_fileName.c_str(),
- CFStringGetSystemEncoding());
-#endif
- dialogCreateOptions.saveFileName = defaultFileNameRef;
+ 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)
{
- dialogCreateOptions.optionFlags |= kNavNoTypePopup;
+ myData.saveMode = true;
+
+ if (!numFilters)
+ {
+ dialogCreateOptions.optionFlags |= kNavNoTypePopup;
+ }
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
// The extension is important
- dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
+ if (numFilters < 2)
+ dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
+#if TARGET_API_MAC_OSX
+ if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+ {
+ dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
+ }
+#endif
err = ::NavCreatePutFileDialog(&dialogCreateOptions,
- 'TEXT',
- 'TEXT',
+ // Suppresses the 'Default' (top) menu item
+ kNavGenericSignature, kNavGenericSignature,
sStandardNavEventFilter,
&myData, // for defaultLocation
&dialog);
}
else
{
- MakeUserDataRec(&myData , m_wildCard);
- size_t numfilters = myData.extensions.GetCount();
- if (numfilters > 0)
- {
- 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] ) ) ;
- }
- }
-
+
+ //let people select bundles/programs in dialogs
+ dialogCreateOptions.optionFlags |= kNavSupportPackages;
+
navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
err = ::NavCreateGetFileDialog(&dialogCreateOptions,
NULL, // NavTypeListHandle
if (navFilterUPP)
::DisposeNavObjectFilterUPP(navFilterUPP);
if (cfArray)
- {
- CFIndex n = ::CFArrayGetCount(cfArray);
- for (CFIndex i = 0; i < n; i++)
- {
- CFStringRef str = (CFStringRef) ::CFArrayGetValueAtIndex(cfArray, i);
- if (str)
- ::CFRelease(str);
- }
::CFRelease(cfArray);
- }
- if (titleRef)
- ::CFRelease(titleRef);
- if (defaultFileNameRef)
- ::CFRelease(defaultFileNameRef);
+
if (err != noErr)
return wxID_CANCEL;
DescType actualType;
Size actualSize;
FSRef theFSRef;
- char thePath[FILENAME_MAX];
+ wxString thePath ;
+
+ m_filterIndex = myData.currentfilter ;
long count;
::AECountItems(&navReply.selection , &count);
for (long i = 1; i <= count; ++i)
{
- err = ::AEGetNthPtr(&(navReply.selection), 1, typeFSRef, &theKeyword, &actualType,
+ err = ::AEGetNthPtr(&(navReply.selection), i, typeFSRef, &theKeyword, &actualType,
&theFSRef, sizeof(theFSRef), &actualSize);
if (err != noErr)
break;
if (m_dialogStyle & wxSAVE)
- {
- thePath[0] = '\0';
- CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
-
- if (parentURLRef)
- {
- CFURLRef fullURLRef =
- ::CFURLCreateCopyAppendingPathComponent(NULL,
- parentURLRef,
- navReply.saveFileName,
- false);
- ::CFRelease(parentURLRef);
- if (fullURLRef)
- {
- CFStringRef cfString = ::CFURLCopyPath(fullURLRef);
- ::CFRelease(fullURLRef);
-
- if (cfString)
- {
- // unescape the URL for
- // "file name" instead of "file%20name"
- CFStringRef cfStringUnescaped =
- ::CFURLCreateStringByReplacingPercentEscapes(NULL,
- cfString,
- CFSTR(""));
- ::CFRelease(cfString);
-
- if (cfStringUnescaped)
- {
-#if wxUSE_UNICODE
- ::CFStringGetCString(cfStringUnescaped,
- thePath,
- FILENAME_MAX,
- kCFStringEncodingUnicode);
-#else
- ::CFStringGetCString(cfStringUnescaped,
- thePath,
- FILENAME_MAX,
- CFStringGetSystemEncoding());
-#endif
- ::CFRelease(cfStringUnescaped);
- }
- }
- }
- }
- if (!thePath[0])
- {
- ::NavDisposeReply(&navReply);
- return wxID_CANCEL;
- }
- }
+ thePath = wxMacFSRefToPath( &theFSRef , navReply.saveFileName ) ;
else
+ thePath = wxMacFSRefToPath( &theFSRef ) ;
+
+ if (!thePath)
{
- err = ::FSRefMakePath(&theFSRef,
- (UInt8 *)thePath, sizeof(thePath));
- if (err != noErr)
- break;
+ ::NavDisposeReply(&navReply);
+ return wxID_CANCEL;
}
m_path = thePath;
m_paths.Add(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