#endif
#include "wx/defs.h"
+#include "wx/app.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/filedlg.h"
#include "wx/intl.h"
+#if !defined(__UNIX__)
+ #include "PLStringFuncs.h"
+#endif
+
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxFileDialog, wxDialog)
#endif
// begin wxmac
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
-#include "PLStringFuncs.h"
+#if defined(__UNIX__)
+ #include <Carbon/Carbon.h>
+#else
+ #include <Navigation.h>
+#endif
+
+#ifndef __UNIX__
+ #include "morefile.h"
+ #include "moreextr.h"
+ #include "fullpath.h"
+ #include "fspcompa.h"
+ #include "PLStringFuncs.h"
+#endif
+
+extern bool gUseNavServices ;
+
+static pascal void NavEventProc(
+ NavEventCallbackMessage inSelector,
+ NavCBRecPtr ioParams,
+ NavCallBackUserData ioUserData);
+
+#if TARGET_CARBON
+ static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
+#else
+ static NavEventUPP sStandardNavEventFilter = NewNavEventProc(NavEventProc);
+#endif
+
+static pascal void
+NavEventProc(
+ NavEventCallbackMessage inSelector,
+ NavCBRecPtr ioParams,
+ NavCallBackUserData /* ioUserData */)
+{
+ if (inSelector == kNavCBEvent) {
+ // In Universal Headers 3.2, Apple changed the definition of
+ /*
+ #if UNIVERSAL_INTERFACES_VERSION >= 0x0320 // Universal Headers 3.2
+ UModalAlerts::ProcessModalEvent(*(ioParams->eventData.eventDataParms.event));
+
+ #else
+ UModalAlerts::ProcessModalEvent(*(ioParams->eventData.event));
+ #endif
+ */
+
+ wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
+ }
+}
char * gfilters[] =
{
// flashing of the button when the key is hit
static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
- short *item, Ptr dataPtr)
+ short *item, void *dataPtr)
{
#pragma unused (dataPtr)
return false;
}
-#endif
+#endif !TARGET_CARBON
void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR)
{
}
}
-static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr)
+static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{
Str255 filename ;
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
int wxFileDialog::ShowModal()
{
+ #if !TARGET_CARBON
+ if ( !gUseNavServices )
+ {
if ( m_dialogStyle & wxSAVE )
{
StandardFileReply reply ;
Str255 prompt ;
Str255 filename ;
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)prompt, m_message) ;
+#else
strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ;
-
+#endif
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)filename, m_fileName) ;
+#else
strcpy((char *)filename, m_fileName) ;
c2pstr((char *)filename ) ;
+#endif
+
#if !TARGET_CARBON
StandardPutFile( prompt , filename , &reply ) ;
}
else
{
- m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+ m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
return wxID_OK ;
}
}
Str255 prompt ;
Str255 path ;
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)prompt, m_message) ;
+#else
strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ;
-
- strcpy((char *)path, m_path ) ;
+#endif
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)path, m_dir ) ;
+#else
+ strcpy((char *)path, m_dir ) ;
c2pstr((char *)path ) ;
+#endif
StandardFileReply reply ;
FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
}
else
{
- m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+ m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
return wxID_OK ;
}
}
return wxID_CANCEL;
}
+ else
+#endif
+ {
+ NavDialogOptions mNavOptions;
+ NavObjectFilterUPP mNavFilterUPP = NULL;
+ NavPreviewUPP mNavPreviewUPP = NULL ;
+ NavReplyRecord mNavReply;
+ AEDesc mDefaultLocation ;
+ bool mSelectDefault = false ;
+
+ ::NavGetDefaultDialogOptions(&mNavOptions);
+
+ mNavFilterUPP = nil;
+ mNavPreviewUPP = nil;
+ mSelectDefault = false;
+ 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;
+
+ // Set default location, the location
+ // that's displayed when the dialog
+ // first appears
+
+ FSSpec location ;
+ wxMacFilename2FSSpec( m_dir , &location ) ;
+ OSErr err = noErr ;
+
+ mDefaultLocation.descriptorType = typeNull;
+ mDefaultLocation.dataHandle = nil;
+
+ err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
+
+ if ( mDefaultLocation.dataHandle ) {
+
+ if (mSelectDefault) {
+ mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
+ } else {
+ mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
+ }
+ }
+
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)mNavOptions.message, m_message) ;
+#else
+ strcpy((char *)mNavOptions.message, m_message) ;
+ c2pstr((char *)mNavOptions.message ) ;
+#endif
+#if TARGET_CARBON
+ c2pstrcpy((StringPtr)mNavOptions.savedFileName, m_fileName) ;
+#else
+ strcpy((char *)mNavOptions.savedFileName, m_fileName) ;
+ c2pstr((char *)mNavOptions.savedFileName ) ;
+#endif
+
+ if ( m_dialogStyle & wxSAVE )
+ {
+
+ mNavOptions.dialogOptionFlags |= kNavNoTypePopup ;
+ mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
+ mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;
+
+ err = ::NavPutFile(
+ &mDefaultLocation,
+ &mNavReply,
+ &mNavOptions,
+ sStandardNavEventFilter ,
+ 'TEXT',
+ 'TEXT',
+ 0L); // User Data
+ }
+ else
+ {
+ if ( m_dialogStyle & wxMULTIPLE )
+ mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
+ else
+ mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
+
+ err = ::NavGetFile(
+ &mDefaultLocation,
+ &mNavReply,
+ &mNavOptions,
+ sStandardNavEventFilter ,
+ mNavPreviewUPP,
+ mNavFilterUPP,
+ 0L /*inFileTypes.TypeListHandle() */,
+ 0L); // User Data
+ }
+
+ if ( mDefaultLocation.dataHandle != nil )
+ {
+ ::AEDisposeDesc(&mDefaultLocation);
+ }
+
+ if ( (err != noErr) && (err != userCanceledErr) ) {
+ m_path = "" ;
+ return wxID_CANCEL ;
+ }
+
+ if (mNavReply.validRecord) {
+
+ FSSpec outFileSpec ;
+ AEDesc specDesc ;
+
+ long count ;
+ ::AECountItems( &mNavReply.selection , &count ) ;
+ for ( long i = 1 ; i <= count ; ++i )
+ {
+ OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, NULL , &specDesc);
+ if ( err != noErr ) {
+ m_path = "" ;
+ return wxID_CANCEL ;
+ }
+ outFileSpec = **(FSSpec**) specDesc.dataHandle;
+ if (specDesc.dataHandle != nil) {
+ ::AEDisposeDesc(&specDesc);
+ }
+
+
+ // outFolderDirID = thePB.dirInfo.ioDrDirID;
+ m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;
+ m_paths.Add( 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);
+
+ return wxID_OK ;
+ }
+ return wxID_CANCEL;
+ }
+}
// Generic file load/save dialog
static wxString
projects / wxWidgets.git / blobdiff