X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da2b4b7a57f816723ed26dbbeca0549b9ce6735a..40325b26300153d83d7c9b124886cca94cf93d5d:/src/mac/filedlg.cpp

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index 6abb80c8d7..87e7846177 100644
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -19,6 +19,7 @@
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
+#include "wx/tokenzr.h"
 
 #ifndef __DARWIN__
   #include "PLStringFuncs.h"
@@ -30,9 +31,9 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 // begin wxmac
 
-#ifndef __DARWIN__
-  #include <Navigation.h>
-#endif
+#include "wx/mac/private.h"
+
+#include <Navigation.h>
 
 #include "MoreFiles.h"
 #include "MoreFilesExtras.h"
@@ -94,7 +95,7 @@ NavEventProc(
 	}
 }
 
-char * gfilters[] =
+const char * gfilters[] =
 {
 	"*.TXT" ,
 	"*.TIF" ,
@@ -113,132 +114,6 @@ OSType gfiltersmac[] =
 } ;
 
 
-#if !TARGET_CARBON
-
-static void wxMacSetupStandardFile(short newVRefNum, long newDirID) 
-{ 
-	enum 
-	{ SFSaveDisk = 0x214, CurDirStore = 0x398 };
-	*(short *) SFSaveDisk = -1 * newVRefNum; 
-	*(long *) CurDirStore = newDirID; 
-}
-
-static void wxMacSetupStandardFileFromPath( const char* s )
-{
-	Str255	volume ;
-	Str255	path ;
-	short	vRefNum ;
-	long dirRef ;
-	short	i,j ;
-	Boolean isDirectory ;
-	
-	for (i=0 ; (s[i]!=0) && (s[i]!=':') ;i++)
-		{
-		volume[i]=s[i] ;
-		}
-	volume[i]=':' ;
-	volume[i+1]=0 ;
-	
-	// then copy the rest of the filename
-	
-	for (j=0;(s[i]!=0);i++,j++)
-		{
-		path[j]=s[i] ;		
-		}
-	path[j]=0 ;
-	
-	c2pstr((Ptr) volume) ;
-	c2pstr((Ptr) path) ;
-	
-	SetVol(volume, 0) ;
-	GetVol( NULL, &vRefNum ) ;
-		
-	GetDirectoryID( vRefNum , fsRtDirID , path , &dirRef , &isDirectory ) ;
-	wxMacSetupStandardFile(vRefNum, dirRef) 	;
-}
-
-enum {
-	kSelectItem = 10, 			// select button item number
-	kSFGetFileDlgID = 251,	// dialog resource number
-	kStrListID = 251,			// our strings
-	kSelectStrNum = 1,			// word 'Select: ' for button
-	kDesktopStrNum = 2,			// word 'Desktop' for button
-	kSelectNoQuoteStrNum = 3,	// word 'Select: ' for button
-	
-	kUseQuotes = true,			// parameter for SetButtonName
-	kDontUseQuotes = false
-};
-
-static void GetLabelString(StringPtr theStr, short stringNum)
-{
-	GetIndString(theStr, kStrListID, stringNum);
-}
-
-static void CopyPStr(StringPtr src, StringPtr dest)
-{
-	BlockMoveData(src, dest, 1 + src[0]);
-}
-
-static char GetSelectKey(void)
-{
-	// this is the key used to trigger the select button
-	
-	// NOT INTERNATIONAL SAVVY; should at least grab it from resources
-	
-	return 's';
-}
-
-// FlashButton briefly highlights the dialog button 
-// as feedback for key equivalents
-
-static void FlashButton(DialogPtr theDlgPtr, short buttonID)
-{
-	short	buttonType;
-	Handle	buttonHandle;
-	Rect	buttonRect;
-	unsigned long	finalTicks;
-	
-	GetDialogItem(theDlgPtr, buttonID, &buttonType, &buttonHandle, &buttonRect);
-	HiliteControl((ControlHandle) buttonHandle, kControlButtonPart);
-	Delay(10, &finalTicks);
-	HiliteControl((ControlHandle) buttonHandle, 0);
-}
-
-static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2)
-{
-	return (spec1->vRefNum == spec2->vRefNum
-			&& spec1->parID == spec2->parID
-			&& EqualString(spec1->name, spec2->name, false, false));
-}
-// MyModalDialogFilter maps a key to the Select button, and handles
-// flashing of the button when the key is hit
-
-static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
-											short *item, void *dataPtr)
-{
-#pragma unused (dataPtr)
-
-	// make certain the proper dialog is showing, 'cause standard file
-	// can nest dialogs but calls the same filter for each
-	
-	if (((WindowPeek) theDlgPtr)->refCon == sfMainDialogRefCon)
-	{
-		// check if the select button was hit
-		/*
-		if ((eventRec->what == keyDown)
-			&& (eventRec->modifiers & cmdKey) 
-			&& ((eventRec->message & charCodeMask) == GetSelectKey()))
-		{
-			*item = kSelectItem;
-			FlashButton(theDlgPtr, kSelectItem);
-			return true;
-		}
-		*/
-	}
-		
-	return false;
-}
-#endif !TARGET_CARBON
 
 void MakeUserDataRec(OpenUserDataRec	*myData , const wxString& filter )
 {
@@ -269,7 +144,7 @@ void MakeUserDataRec(OpenUserDataRec	*myData , const wxString& filter )
         current += filter2.GetChar(i) ;
        }
     }
-    if ( filterIndex > 0 )
+//    if ( filterIndex > 0 )
     {
       wxASSERT_MSG( !isName , "incorrect format of format string" ) ;
       myData->extensions[filterIndex] = current.MakeUpper() ;
@@ -301,109 +176,6 @@ void MakeUserDataRec(OpenUserDataRec	*myData , const wxString& filter )
 
 }
 
-#if !TARGET_CARBON
-void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
-{
-	Point 				thePt;
-	OpenUserDataRec			myData;
-	FSSpec				tempSpec;
-	Boolean				folderFlag;
-	Boolean				wasAliasedFlag;
-	DlgHookYDUPP		dlgHookUPP;
-	ModalFilterYDUPP	myModalFilterUPP;
-	OSErr				err;
-	SFTypeList			types ;
-	
-	// presumably we're running System 7 or later so CustomGetFile is
-	// available
-	
-	// set initial contents of Select button to a space
-	
-	memcpy( theSFR->sfFile.name , "\p " , 2 ) ;
-	
-	// point the user data parameter at the reply record so we can get to it later
-	
-	MakeUserDataRec( &myData , filter ) ;
-	// display the dialog
-
-	dlgHookUPP = NULL ;
-//	dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
-	myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);
-	
-	thePt.h = thePt.v = -1;	// center dialog
-	
-	ParamText( message , NULL , NULL , NULL ) ;
-	
-	CustomGetFile(	fileFilter, 
-			-1,		       		// show all types
-			NULL,
-			theSFR,
-			kSFGetFileDlgID,
-			thePt,				// top left point
-			dlgHookUPP,
-			myModalFilterUPP,
-			nil,				// activate list
-			nil,				// activate proc
-			&myData);
-					
-	DisposeRoutineDescriptor(dlgHookUPP);
-	DisposeRoutineDescriptor(myModalFilterUPP);
-
-	// if cancel wasn't pressed and no fatal error occurred...
-	
-	if (theSFR->sfGood)
-	{
-		// if no name is in the reply record file spec,
-		// use the file spec of the parent folder
-		
-		if (theSFR->sfFile.name[0] == '\0')
-		{
-			err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,
-					   "\p", &tempSpec);
-			if (err == noErr)
-			{
-				theSFR->sfFile = tempSpec;
-			}
-			else
-			{
-				// no name to return, forget it
-				
-				theSFR->sfGood = false;
-			}
-		}
-		
-		// if there is now a name in the file spec, check if it's
-		// for a folder or a volume
-		
-		if (theSFR->sfFile.name[0] != '\0')
-		{
-			// the parID of the root of a disk is always fsRtParID == 1
-			
-			if (theSFR->sfFile.parID == fsRtParID)
-			{
-				theSFR->sfIsVolume = true;
-				theSFR->sfIsFolder = false;	// it would be reasonable for this to be true, too
-			}
-			
-			// we have a valid FSSpec, now let's make sure it's not for an alias file
-			
-			err = ResolveAliasFile(&theSFR->sfFile, true, &folderFlag, &wasAliasedFlag);
-			if (err != noErr)
-			{
-				theSFR->sfGood = false;
-			}
-			
-			// did the alias resolve to a folder?
-			
-			if (folderFlag  && ! theSFR->sfIsVolume)
-			{
-				theSFR->sfIsFolder = true;
-			}
-		}
-	}
-}
-#endif
-
 static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
 {
     Str255 			filename ;
@@ -420,27 +192,31 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
     if ( data->numfilters > 0 )
     {
 	//for ( int i = 0 ; i < data->numfilters ; ++i )
-	int i = data->currentfilter ;
-	if ( data->extensions[i].Right(2) == ".*" )
-	    return true ;
+	    int i = data->currentfilter ;
+	    if ( data->extensions[i].Right(2) == ".*" )
+	      return true ;
 	
-	{
-	    if ( type == data->filtermactypes[i] )
-		return true ;
-	    
-	    wxString extension = data->extensions[i] ;
-	    if ( extension.GetChar(0) == '*' )
-		extension = extension.Mid(1) ;
+	    {
+	      if ( type == data->filtermactypes[i] )
+		      return true ;
 	    
-	    if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
-		return true ;
-	}
-	return false ;
+	      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 ;
     }
     return true ;
 }
 
-#if !TARGET_CARBON
+#ifndef __DARWIN__
 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {	
 	OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
@@ -534,6 +310,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
         long style, const wxPoint& pos)
 {
+	  wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ;
     m_message = message;
     m_dialogStyle = style;
     m_parent = parent;
@@ -561,11 +338,7 @@ pascal Boolean CrossPlatformFilterCallback (
 		if (theItem->descriptorType == typeFSS && !theInfo->isFolder)
 		{
 		  FSSpec	spec;
-#if TARGET_CARBON
-		  ::AEGetDescData(theItem, &spec, sizeof(FSSpec) ) ;
-#else
-		  memcpy( &spec , (*theItem->dataHandle) , sizeof(FSSpec) ) ;
-#endif
+		  memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
 		  display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
 		}
 	}
@@ -575,65 +348,6 @@ pascal Boolean CrossPlatformFilterCallback (
 
 int wxFileDialog::ShowModal()
 {
-#if !TARGET_CARBON
-	if ( !gUseNavServices )
-	{
-	if ( m_dialogStyle & wxSAVE )
-	{
-		StandardFileReply	reply ;
-		Str255				prompt ;
-		Str255				filename ;
-
-		strcpy((char *)prompt, m_message) ;
-		c2pstr((char *)prompt ) ;
-		strcpy((char *)filename, m_fileName) ;
-		c2pstr((char *)filename ) ;
-
-		StandardPutFile( prompt , filename , &reply ) ;
-		if ( reply.sfGood == false )
-		{
-			m_path = "" ;
-			return wxID_CANCEL ;
-		}
-		else
-		{
-			m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
-			return wxID_OK ;
-		}
-	}
-	else
-	{
-		OSType types = '????' ;
-		Str255				prompt ;
-		Str255				path ;
-
-		strcpy((char *)prompt, m_message) ;
-		c2pstr((char *)prompt ) ;
-		strcpy((char *)path, m_dir ) ;
-		c2pstr((char *)path ) ;
-
-		StandardFileReply	reply ;
-		FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
-		crossPlatformFileFilterUPP = 
-			NewFileFilterYDProc(CrossPlatformFileFilter);
-		ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
-		DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
-		if ( reply.sfGood == false )
-		{
-			m_path = "" ;
-			return wxID_CANCEL ;
-		}
-		else
-		{
-			m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
-			return wxID_OK ;
-		}
-	}
-    return wxID_CANCEL;
-}
-	else
-#endif
-	{
 		NavDialogOptions		mNavOptions;
 		NavObjectFilterUPP		mNavFilterUPP = NULL;
 		NavPreviewUPP			mNavPreviewUPP = NULL ;
@@ -762,12 +476,13 @@ int wxFileDialog::ShowModal()
 		
 			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, NULL , &specDesc);
+				OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
 				if ( err != noErr ) {
 					m_path = "" ;
 					return wxID_CANCEL ;
@@ -787,11 +502,10 @@ int wxFileDialog::ShowModal()
 	         m_path = m_paths[ 0 ] ;
 	         m_fileName = wxFileNameFromPath(m_path);
 	         m_dir = wxPathOnly(m_path);
-            
+       NavDisposeReply( &mNavReply ) ;
 			return wxID_OK ;
 		}
 		return wxID_CANCEL;
-	}
 }
 
 // Generic file load/save dialog