diff options
| author | das <das@noemail.net> | 2001-11-23 02:04:07 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2001-11-23 02:04:07 (GMT) |
| commit | 2570e40473dbfef4aafdc2d32687788cb096b872 (patch) | |
| tree | 0d0864ac4fc0b0ff178f5869f1600d2c584109c8 /generic/tkConsole.c | |
| parent | 177acc7add7f613bacfa038f71187e82f4dcf415 (diff) | |
| download | tk-2570e40473dbfef4aafdc2d32687788cb096b872.zip tk-2570e40473dbfef4aafdc2d32687788cb096b872.tar.gz tk-2570e40473dbfef4aafdc2d32687788cb096b872.tar.bz2 | |
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435660)
see ChangeLog for details
FossilOrigin-Name: 72721350b6f21354b5149babeafdb2304ece1e2e
Diffstat (limited to 'generic/tkConsole.c')
| -rw-r--r-- | generic/tkConsole.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index bb6bcad..e09eefe 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkConsole.c,v 1.13 2001/08/06 18:29:41 dgp Exp $ + * RCS: @(#) $Id: tkConsole.c,v 1.14 2001/11/23 02:04:44 das Exp $ */ #include "tk.h" @@ -336,7 +336,7 @@ Tk_CreateConsoleWindow(interp) ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); #ifdef MAC_TCL - static char initCmd[] = "source -rsrc {Console}"; + static char initCmd[] = "if {[catch {source $tk_library:console.tcl}]} {source -rsrc console}"; #else static char initCmd[] = "source $tk_library/console.tcl"; #endif @@ -476,6 +476,9 @@ ConsoleClose(instanceData, interp) ClientData instanceData; /* Unused. */ Tcl_Interp *interp; /* Unused. */ { + ThreadSpecificData *tsdPtr = (ThreadSpecificData *) + Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + tsdPtr->gStdoutInterp = NULL; return 0; } |