CW5.2 Pro Adaptions, wxMac starting to move in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
@@ -23,7 +23,352 @@
|
||||
IMPLEMENT_CLASS(wxFileDialog, wxDialog)
|
||||
#endif
|
||||
|
||||
WXDLLEXPORT wxString wxFileSelector(const char *title,
|
||||
// begin wxmac
|
||||
|
||||
#include "morefile.h"
|
||||
#include "moreextr.h"
|
||||
#include "fullpath.h"
|
||||
#include "fspcompa.h"
|
||||
#include "PLStringFuncs.h"
|
||||
|
||||
char * gfilters[] =
|
||||
{
|
||||
"*.TXT" ,
|
||||
|
||||
NULL
|
||||
} ;
|
||||
|
||||
OSType gfiltersmac[] =
|
||||
{
|
||||
'TEXT' ,
|
||||
|
||||
'****'
|
||||
} ;
|
||||
|
||||
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
|
||||
};
|
||||
|
||||
// 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)
|
||||
// and a copy of the "previous" file spec of the reply record
|
||||
// so we can see if the selection has changed
|
||||
|
||||
const int kwxMacFileTypes = 10 ;
|
||||
|
||||
struct OpenUserDataRec {
|
||||
StandardFileReply *sfrPtr;
|
||||
FSSpec oldSelectionFSSpec;
|
||||
char filter[kwxMacFileTypes][10] ;
|
||||
OSType filtermactypes[kwxMacFileTypes] ;
|
||||
int numfilters ;
|
||||
DialogPtr theDlgPtr;
|
||||
};
|
||||
typedef struct OpenUserDataRec
|
||||
OpenUserDataRec, *OpenUserDataRecPtr;
|
||||
|
||||
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, Ptr 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;
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
CopyPStr("\p ", theSFR->sfFile.name);
|
||||
|
||||
// point the user data parameter at the reply record so we can get to it later
|
||||
|
||||
myData.sfrPtr = theSFR;
|
||||
if ( filter && filter[0] )
|
||||
{
|
||||
myData.numfilters = 1 ;
|
||||
for ( int i = 0 ; i < myData.numfilters ; i++ )
|
||||
{
|
||||
int j ;
|
||||
|
||||
strcpy( myData.filter[i] , filter ) ;
|
||||
for( j = 0 ; myData.filter[i][j] ; j++ )
|
||||
{
|
||||
myData.filter[i][j] = toupper( myData.filter[i][j] ) ;
|
||||
}
|
||||
for ( j = 0 ; gfilters[j] ; j++ )
|
||||
{
|
||||
if ( strcmp( myData.filter[i] , gfilters[j] ) == 0 )
|
||||
{
|
||||
myData.filtermactypes[i] = gfiltersmac[j] ;
|
||||
break ;
|
||||
}
|
||||
}
|
||||
if( gfilters[j] == NULL )
|
||||
{
|
||||
myData.filtermactypes[i] = '****' ;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
myData.numfilters = 0 ;
|
||||
}
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr)
|
||||
{
|
||||
Str255 filename ;
|
||||
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 )
|
||||
{
|
||||
if ( data->numfilters > 0 )
|
||||
{
|
||||
PLstrcpy( filename ,myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
|
||||
if ( filename[0] >= 4 )
|
||||
{
|
||||
for( int j = 1 ; j <= filename[0] ; j++ )
|
||||
{
|
||||
filename[j] = toupper( filename[j] ) ;
|
||||
}
|
||||
for ( int i = 0 ; i < data->numfilters ; ++i )
|
||||
{
|
||||
if ( myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType == data->filtermactypes[i] )
|
||||
return false ;
|
||||
|
||||
if ( strncmp( (char*) filename + 1 + filename[0] - 4 ,
|
||||
& data->filter[i][ strlen(data->filter[i]) - 4 ] , 4 ) == 0 )
|
||||
return false ;
|
||||
}
|
||||
}
|
||||
return true ;
|
||||
}
|
||||
}
|
||||
|
||||
return false ;
|
||||
}
|
||||
|
||||
// end wxmac
|
||||
|
||||
wxString wxFileSelector(const char *title,
|
||||
const char *defaultDir, const char *defaultFileName,
|
||||
const char *defaultExtension, const char *filter, int flags,
|
||||
wxWindow *parent, int x, int y)
|
||||
@@ -100,7 +445,61 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
|
||||
|
||||
int wxFileDialog::ShowModal()
|
||||
{
|
||||
// TODO
|
||||
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 = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
|
||||
return wxID_OK ;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
OSType types = '????' ;
|
||||
Str255 prompt ;
|
||||
Str255 path ;
|
||||
|
||||
strcpy((char *)prompt, m_message) ;
|
||||
c2pstr((char *)prompt ) ;
|
||||
|
||||
strcpy((char *)path, m_path ) ;
|
||||
c2pstr((char *)path ) ;
|
||||
|
||||
FileFilterYDUPP crossPlatformFileFilterUPP;
|
||||
StandardFileReply reply ;
|
||||
crossPlatformFileFilterUPP =
|
||||
NewFileFilterYDProc(CrossPlatformFileFilter);
|
||||
|
||||
ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
|
||||
|
||||
DisposeRoutineDescriptor(crossPlatformFileFilterUPP);
|
||||
if ( reply.sfGood == false )
|
||||
{
|
||||
m_path = "" ;
|
||||
return wxID_CANCEL ;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
|
||||
return wxID_OK ;
|
||||
}
|
||||
}
|
||||
return wxID_CANCEL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user