diff options
Diffstat (limited to 'macosx/tkMacOSXHLEvents.c')
-rw-r--r-- | macosx/tkMacOSXHLEvents.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 8d51c33..9671ab9 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -51,15 +51,15 @@ static OSStatus FSRefToDString(const FSRef *fsref, Tcl_DString *ds); #pragma mark TKApplication(TKHLEvents) @implementation TKApplication(TKHLEvents) -- (void) terminate: (id) sender -{ + +- (void)terminate:(id)sender { QuitHandler(NULL, NULL, (SRefCon) _eventInterp); } -- (void) preferences: (id) sender -{ +- (void)preferences:(id)sender { PrefsHandler(NULL, NULL, (SRefCon) _eventInterp); } + @end #pragma mark - @@ -186,7 +186,7 @@ QuitHandler( * quickly as possible. */ - eventPtr = ckalloc(sizeof(KillEvent)); + eventPtr = (KillEvent *) ckalloc(sizeof(KillEvent)); eventPtr->header.proc = ReallyKillMe; eventPtr->interp = interp; @@ -221,10 +221,10 @@ OappHandler( Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon; if (interp && - Tcl_FindCommand(interp, "::tk::mac::OpenApplication", NULL, 0)){ + Tcl_GetCommandInfo(interp, "::tk::mac::OpenApplication", &dummy)){ int code = Tcl_EvalEx(interp, "::tk::mac::OpenApplication", -1, TCL_EVAL_GLOBAL); if (code != TCL_OK) { - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } } return noErr; @@ -252,15 +252,16 @@ RappHandler( AppleEvent *reply, SRefCon handlerRefcon) { + Tcl_CmdInfo dummy; Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon; ProcessSerialNumber thePSN = {0, kCurrentProcess}; OSStatus err = ChkErr(SetFrontProcess, &thePSN); - if (interp && Tcl_FindCommand(interp, - "::tk::mac::ReopenApplication", NULL, 0)) { + if (interp && Tcl_GetCommandInfo(interp, + "::tk::mac::ReopenApplication", &dummy)) { int code = Tcl_EvalEx(interp, "::tk::mac::ReopenApplication", -1, TCL_EVAL_GLOBAL); if (code != TCL_OK){ - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } } return err; @@ -293,10 +294,10 @@ PrefsHandler( Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon; if (interp && - Tcl_FindCommand(interp, "::tk::mac::ShowPreferences", NULL, 0)){ + Tcl_GetCommandInfo(interp, "::tk::mac::ShowPreferences", &dummy)){ int code = Tcl_EvalEx(interp, "::tk::mac::ShowPreferences", -1, TCL_EVAL_GLOBAL); if (code != TCL_OK) { - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } } return noErr; @@ -332,6 +333,7 @@ OdocHandler( long count, index; AEKeyword keyword; Tcl_DString command, pathName; + Tcl_CmdInfo dummy; int code; /* @@ -340,7 +342,7 @@ OdocHandler( */ if (!interp || - !Tcl_FindCommand(interp, "::tk::mac::OpenDocument", NULL, 0)) { + !Tcl_GetCommandInfo(interp, "::tk::mac::OpenDocument", &dummy)) { return noErr; } @@ -386,7 +388,7 @@ OdocHandler( code = Tcl_EvalEx(interp, Tcl_DStringValue(&command), Tcl_DStringLength(&command), TCL_EVAL_GLOBAL); if (code != TCL_OK) { - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } Tcl_DStringFree(&command); return noErr; @@ -431,7 +433,7 @@ PrintHandler( */ if (!interp || - !Tcl_FindCommand(interp, "::tk::mac::PrintDocument", NULL, 0)) { + !Tcl_GetCommandInfo(interp, "::tk::mac::PrintDocument", &dummy)) { return noErr; } @@ -472,7 +474,7 @@ PrintHandler( code = Tcl_EvalEx(interp, Tcl_DStringValue(&command), Tcl_DStringLength(&command), TCL_EVAL_GLOBAL); if (code != TCL_OK) { - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } Tcl_DStringFree(&command); return noErr; @@ -543,7 +545,7 @@ ScriptHandler( theErr = FSRefToDString(&file, &scriptName); if (theErr == noErr) { - tclErr = Tcl_FSEvalFileEx(interp, Tcl_DStringValue(&scriptName), NULL); + tclErr = Tcl_EvalFile(interp, Tcl_DStringValue(&scriptName)); Tcl_DStringFree(&scriptName); } else { sprintf(errString, "AEDoScriptHandler: file not found"); @@ -621,7 +623,8 @@ ReallyKillMe( int flags) { Tcl_Interp *interp = ((KillEvent *) eventPtr)->interp; - int quit = Tcl_FindCommand(interp, "::tk::mac::Quit", NULL, 0)!=NULL; + Tcl_CmdInfo dummy; + int quit = Tcl_GetCommandInfo(interp, "::tk::mac::Quit", &dummy); int code = Tcl_EvalEx(interp, quit ? "::tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL); if (code != TCL_OK) { @@ -629,7 +632,7 @@ ReallyKillMe( * Should be never reached... */ - Tcl_BackgroundException(interp, code); + Tcl_BackgroundError(interp); } return 1; } |