diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2020-08-28 01:32:48 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2020-08-28 01:32:48 (GMT) |
| commit | 029438fb7c249102b37dd5607be4e7080aad658c (patch) | |
| tree | d421d06106beb36c4fa36394c0189473f4b8199c | |
| parent | db647f131b9e08474b8453e88ef2d49d5c69cdb1 (diff) | |
| parent | 79cce61253647cf934c292ae7c32c133c4cff51e (diff) | |
| download | tk-029438fb7c249102b37dd5607be4e7080aad658c.zip tk-029438fb7c249102b37dd5607be4e7080aad658c.tar.gz tk-029438fb7c249102b37dd5607be4e7080aad658c.tar.bz2 | |
Merge doscript_goof branch; thanks to Lars Hellstrom for patches
| -rw-r--r-- | library/tk.tcl | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXHLEvents.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index 311d316..441bd25 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -687,9 +687,11 @@ if {[tk windowingsystem] eq "aqua"} { if {[tk windowingsystem] eq "aqua"} { #stub procedures to respond to "do script" Apple Events proc ::tk::mac::DoScriptFile {file} { + uplevel #0 $file source $file } proc ::tk::mac::DoScriptText {script} { + uplevel #0 $script eval $script } } diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 3b65681..92551bd 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -325,6 +325,7 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText"; if (noErr == AEGetParamPtr(theDesc, keyDirectObject, typeUTF8Text, &type, data, actual, NULL)) { + data[actual] = '\0'; AppleEventInfo *AEInfo = (AppleEventInfo *)ckalloc(sizeof(AppleEventInfo)); Tcl_DString *scriptTextCommand = &AEInfo->command; Tcl_DStringInit(scriptTextCommand); |