diff options
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/tkMacDialog.c | 38 | ||||
| -rw-r--r-- | mac/tkMacMenus.c | 27 |
2 files changed, 43 insertions, 22 deletions
diff --git a/mac/tkMacDialog.c b/mac/tkMacDialog.c index 51c250c..629860c 100644 --- a/mac/tkMacDialog.c +++ b/mac/tkMacDialog.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacDialog.c,v 1.5 2000/04/17 02:16:50 jingham Exp $ + * RCS: @(#) $Id: tkMacDialog.c,v 1.6 2000/04/23 03:47:24 jingham Exp $ */ #include <Gestalt.h> @@ -305,11 +305,15 @@ Tk_GetOpenFileObjCmd( AEDesc initialDesc = {typeNull, NULL}; FSSpec dirSpec; static char *openOptionStrings[] = { - "-filetypes", "-initialdir", "-message", "-multiple", + "-defaultextension", "-filetypes", + "-initialdir", "-initialfile", + "-message", "-multiple", "-parent", "-title", NULL }; enum openOptions { - OPEN_TYPES, OPEN_INITDIR, OPEN_MESSAGE, OPEN_MULTIPLE, + OPEN_DEFAULT, OPEN_TYPES, + OPEN_INITDIR, OPEN_INITFILE, + OPEN_MESSAGE, OPEN_MULTIPLE, OPEN_PARENT, OPEN_TITLE }; @@ -349,6 +353,8 @@ Tk_GetOpenFileObjCmd( } switch (index) { + case OPEN_DEFAULT: + break; case OPEN_TYPES: choice = Tcl_GetStringFromObj(objv[i + 1], NULL); if (TkGetFileFilters(interp, &ofd.fl, choice, 0) @@ -365,6 +371,8 @@ Tk_GetOpenFileObjCmd( goto end; } break; + case OPEN_INITFILE: + break; case OPEN_MESSAGE: choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen); Tcl_UtfToExternal(NULL, NULL, choice, choiceLen, @@ -898,7 +906,17 @@ NavServicesGetFile( openFileEventUPP, NULL, NULL); } - theResult = Tcl_NewListObj(0, NULL); + + /* + * Most commands assume that the file dialogs return a single + * item, not a list. So only build a list if multiple is true... + */ + + if (multiple) { + theResult = Tcl_NewListObj(0, NULL); + } else { + theResult = Tcl_NewObj(); + } if ( theReply.validRecord && err == noErr ) { AEDesc resultDesc; @@ -921,9 +939,15 @@ NavServicesGetFile( &length, &pathHandle); HLock(pathHandle); Tcl_ExternalToUtfDString(NULL, (char *) *pathHandle, -1, &fileName); - Tcl_ListObjAppendElement(interp, theResult, - Tcl_NewStringObj(Tcl_DStringValue(&fileName), - Tcl_DStringLength(&fileName))); + if (multiple) { + Tcl_ListObjAppendElement(interp, theResult, + Tcl_NewStringObj(Tcl_DStringValue(&fileName), + Tcl_DStringLength(&fileName))); + } else { + Tcl_SetStringObj(theResult, Tcl_DStringValue(&fileName), + Tcl_DStringLength(&fileName)); + } + Tcl_DStringFree(&fileName); HUnlock(pathHandle); DisposeHandle(pathHandle); diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c index 2230f7a..f83e49d 100644 --- a/mac/tkMacMenus.c +++ b/mac/tkMacMenus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacMenus.c,v 1.5 2000/02/10 08:56:03 jingham Exp $ + * RCS: @(#) $Id: tkMacMenus.c,v 1.6 2000/04/23 03:47:32 jingham Exp $ */ #include "tcl.h" @@ -329,29 +329,26 @@ GenerateEditEvent( static void SourceDialog() { - StandardFileReply reply; - OSType fileTypes[1]; - OSErr err; - int length, result; - Handle path; + int result; + char *path; + char openCmd[] = "tk_getOpenFile -filetypes {\ + {{TCL Scripts} {.tcl} TEXT} {{Text Files} {} TEXT}}"; if (gInterp == NULL) { return; } - fileTypes[0] = 'TEXT'; - StandardGetFile(NULL, 1, fileTypes, &reply); - if (reply.sfGood == false) { + if (Tcl_Eval(gInterp, openCmd) != TCL_OK) { return; } - err = FSpPathFromLocation(&reply.sfFile, &length, &path); - if (err == noErr) { - HLock(path); - result = Tcl_EvalFile(gInterp, *path); - HUnlock(path); - DisposeHandle(path); + path = Tcl_GetStringResult(gInterp); + + if (strlen(path) == 0) { + return; } + + result = Tcl_EvalFile(gInterp, path); if (result == TCL_ERROR) { Tcl_BackgroundError(gInterp); } |