/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.cpp
+// Name: src/mac/carbon/filedlg.cpp
// Purpose: wxFileDialog
// Author: Stefan Csomor
// Modified by:
// 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 wxUSE_FILEDLG
-#ifndef __DARWIN__
- #include "PLStringFuncs.h"
-#endif
+#include "wx/filedlg.h"
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
#endif
-// begin wxmac
+#include "wx/tokenzr.h"
+#include "wx/filename.h"
#include "wx/mac/private.h"
-#include <Navigation.h>
-
-#include "MoreFilesX.h"
+#ifndef __DARWIN__
+ #include <Navigation.h>
+ #include "PLStringFuncs.h"
+#endif
-extern bool gUseNavServices ;
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
// 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 ;
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 );
-static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
+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 (inSelector == kNavCBEvent)
+ {
}
else if ( inSelector == kNavCBStart )
{
- if (data && !(data->defaultLocation).IsEmpty())
+ if (data && !(data->defaultLocation).empty())
{
// 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))
+ FSRef theFile;
+ wxMacPathToFSRef(data->defaultLocation, &theFile);
+ AEDesc theLocation = { typeNull, NULL };
+ if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
}
if ( data->saveMode )
{
int i = menu->menuType ;
- wxString extension = data->extensions[i].AfterLast('.') ;
- extension.MakeLower() ;
+
+ // isolate the first extension string
+ wxString firstExtension = data->extensions[i].BeforeFirst('|').BeforeFirst(';');
+
+ wxString extension = firstExtension.AfterLast('.') ;
wxString sfilename ;
wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false );
}
}
-
-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] )
+ if ( !filter.empty() )
{
wxString filter2(filter) ;
int filterIndex = 0;
bool isName = true ;
wxString current ;
- for( unsigned int i = 0; i < filter2.Len() ; i++ )
+
+ for ( unsigned int i = 0; i < filter2.length() ; i++ )
{
- if( filter2.GetChar(i) == wxT('|') )
+ if ( filter2.GetChar(i) == wxT('|') )
{
- if( isName ) {
+ if ( isName )
+ {
myData->name.Add( current ) ;
}
- else {
- myData->extensions.Add( current.MakeUpper() ) ;
+ else
+ {
+ myData->extensions.Add( current ) ;
++filterIndex ;
}
+
isName = !isName ;
current = wxEmptyString ;
}
// 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() )
+ if ( current.empty() )
myData->extensions.Add( myData->name[filterIndex] ) ;
else
- myData->extensions.Add( current.MakeUpper() ) ;
+ myData->extensions.Add( current ) ;
if ( filterIndex == 0 || isName )
- myData->name.Add( current.MakeUpper() ) ;
+ myData->name.Add( current ) ;
++filterIndex ;
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];
- if (extension.GetChar(0) == '*')
- extension = extension.Mid(1); // Remove leading *
+ // Remove leading '*'
+ if (extension.length() && (extension.GetChar(0) == '*'))
+ extension = extension.Mid( 1 );
+
+ // Remove leading '.'
+ if (extension.length() && (extension.GetChar(0) == '.'))
+ extension = extension.Mid( 1 );
- 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
- }
+ 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) == '*' )
extension = extension.Mid(1) ;
+ extension.MakeUpper();
- if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+ if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )
return true ;
}
}
+
return false ;
}
+
return true ;
}
// 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, const wxSize& sz, const wxString& name)
+ : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
{
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 ;
if (filterMode == kNavFilteringBrowserList)
{
+ // We allow navigation to all folders. For files, we check against the current
+ // filter string.
+ // However, packages should be dealt with like files and not like folders. So
+ // check if a folder is a package before deciding what to do.
+ FSRef fsref;
NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
- if ( !theInfo->isFolder )
+ AECoerceDesc (theItem, typeFSRef, theItem);
+ if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) != noErr)
+ return true;
+
+ 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 ) ;
- }
+ // check bundle bit (using Finder Services - used by OS9 on some bundles)
+ FSCatalogInfo catalogInfo;
+ if (FSGetCatalogInfo (&fsref, kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL) != noErr)
+ return true;
+
+ // Check bundle item (using Launch Services - used by OS-X through info.plist or APP)
+ LSItemInfoRecord lsInfo;
+ if (LSCopyItemInfoForRef(&fsref, kLSRequestBasicFlagsOnly, &lsInfo ) != noErr)
+ return true;
+
+ // If it's not a bundle, then it's a normal folder and it passes our filter
+ FileInfo *fileInfo = (FileInfo *) catalogInfo.finderInfo;
+ if ( !(fileInfo->finderFlags & kHasBundle) &&
+ !(lsInfo.flags & (kLSItemInfoIsApplication | kLSItemInfoIsPackage)) )
+ return true;
}
+
+ wxString file = wxMacFSRefToPath( &fsref ) ;
+ return CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+
}
- return display;
+ return true;
}
int wxFileDialog::ShowModal()
{
OSErr err;
NavDialogCreationOptions dialogCreateOptions;
+
// set default options
::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
NavDialogRef dialog;
NavObjectFilterUPP navFilterUPP = NULL;
- CFArrayRef cfArray = NULL; // for popupExtension
OpenUserDataRec myData;
myData.defaultLocation = m_dir;
}
}
- if (m_dialogStyle & wxSAVE)
+ if (HasFdFlag(wxFD_SAVE))
{
myData.saveMode = true;
- if (!numFilters)
- {
- dialogCreateOptions.optionFlags |= kNavNoTypePopup;
- }
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
+ if (!numFilters)
+ dialogCreateOptions.optionFlags |= kNavNoTypePopup;
// The extension is important
if (numFilters < 2)
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
#if TARGET_API_MAC_OSX
- if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
- {
- dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
- }
+ if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))
+ dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
#endif
- err = ::NavCreatePutFileDialog(&dialogCreateOptions,
- // Suppresses the 'Default' (top) menu item
- kNavGenericSignature, kNavGenericSignature,
- sStandardNavEventFilter,
- &myData, // for defaultLocation
- &dialog);
+
+ err = ::NavCreatePutFileDialog(
+ &dialogCreateOptions,
+ kNavGenericSignature, // Suppresses the 'Default' (top) menu item
+ kNavGenericSignature,
+ sStandardNavEventFilter,
+ &myData, // for defaultLocation
+ &dialog );
}
else
{
-
- //let people select bundles/programs in dialogs
+ // 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)
// clean up filter related data, etc.
if (navFilterUPP)
::DisposeNavObjectFilterUPP(navFilterUPP);
- if (cfArray)
- ::CFRelease(cfArray);
if (err != noErr)
return wxID_CANCEL;
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;
- if (m_dialogStyle & wxSAVE)
- thePath = wxMacFSRefToPath( &theFSRef , navReply.saveFileName ) ;
+ if (HasFdFlag(wxFD_SAVE))
+ thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
else
- thePath = wxMacFSRefToPath( &theFSRef ) ;
-
+ 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;
}
+#endif // wxUSE_FILEDLG
+
projects / wxWidgets.git / blobdiff