#include "wx/wxprec.h"
+#if wxUSE_FILEDLG
+
#include "wx/filedlg.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
#endif
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
#include "wx/tokenzr.h"
#include "wx/filename.h"
#include "wx/mac/private.h"
#ifndef __DARWIN__
- #include <Navigation.h>
- #include "PLStringFuncs.h"
+ #include <Navigation.h>
+ #include "PLStringFuncs.h"
#endif
-#include "MoreFilesX.h"
-
IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
-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)
}
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);
+ FSRef theFile;
+ wxMacPathToFSRef(data->defaultLocation, &theFile);
AEDesc theLocation = { typeNull, NULL };
- if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
+ if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
}
- 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);
+ if( data->extensions.GetCount() > 0 )
+ {
+ NavMenuItemSpec menuItem;
+ memset( &menuItem, 0, sizeof(menuItem) );
+ menuItem.version = kNavMenuItemSpecVersion;
+ menuItem.menuType = data->currentfilter;
+ ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
+ }
}
else if ( inSelector == kNavCBPopupMenuSelect )
{
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 );
sfilename = cfString.AsString() ;
int pos = sfilename.Find('.', true) ;
- if ( pos != wxNOT_FOUND )
+ if ( pos != wxNOT_FOUND && extension != wxT("*") )
{
sfilename = sfilename.Left(pos+1)+extension ;
cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;
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('|') )
{
}
else
{
- myData->extensions.Add( current.MakeUpper() ) ;
+ myData->extensions.Add( current ) ;
++filterIndex ;
}
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 ;
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 true ;
}
-#if !TARGET_API_MAC_OSX
-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 )
- {
- wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
- return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
- }
-
- return false ;
-}
-#endif
-
// 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)
+ 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") ) ;
}
void *callBackUD,
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.
NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
- if ( !theInfo->isFolder )
+ FSRef fsref;
+
+ 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 )
+ // 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;
+ }
+ else
+ {
+ AECoerceDesc (theItem, typeFSRef, theItem);
+ if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr)
{
- FSRef fsref ;
- memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;
wxString file = wxMacFSRefToPath( &fsref ) ;
- display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+ return CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
}
}
}
- return display;
+ return true;
}
int wxFileDialog::ShowModal()
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 < 2)
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
-#if TARGET_API_MAC_OSX
- if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+ if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))
dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
-#endif
err = ::NavCreatePutFileDialog(
&dialogCreateOptions,
// clean up filter related data, etc.
if (navFilterUPP)
::DisposeNavObjectFilterUPP(navFilterUPP);
- if (cfArray)
- ::CFRelease(cfArray);
if (err != noErr)
+ {
+ ::NavDialogDispose(dialog);
return wxID_CANCEL;
+ }
NavReplyRecord navReply;
err = ::NavDialogGetReply(dialog, &navReply);
if (err != noErr)
break;
- if (m_dialogStyle & wxSAVE)
+ if (HasFdFlag(wxFD_SAVE))
thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
else
thePath = wxMacFSRefToPath( &theFSRef );
if (!thePath)
{
::NavDisposeReply(&navReply);
+ ::NavDialogDispose(dialog);
return wxID_CANCEL;
}
}
::NavDisposeReply(&navReply);
+ ::NavDialogDispose(dialog);
return (err == noErr) ? wxID_OK : wxID_CANCEL;
}
+
+#endif // wxUSE_FILEDLG
+
projects / wxWidgets.git / blobdiff