diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2005-11-10 11:38:29 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2005-11-10 11:38:29 (GMT) |
| commit | edc304c9592d5d5d530ad08c033006e7ce1c38f1 (patch) | |
| tree | 517a8bbdaa7cc28359b34c040456cec897ee44cd /generic | |
| parent | 1acbd7884a685ddd69efcf085700c36f2192bc95 (diff) | |
| download | tk-edc304c9592d5d5d530ad08c033006e7ce1c38f1.zip tk-edc304c9592d5d5d530ad08c033006e7ce1c38f1.tar.gz tk-edc304c9592d5d5d530ad08c033006e7ce1c38f1.tar.bz2 | |
Fixes of other issues raised in [Bug 1353022]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkBind.c | 6 | ||||
| -rw-r--r-- | generic/tkTextWind.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 235a0fa..44f5949 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkBind.c,v 1.37 2005/11/04 11:52:50 dkf Exp $ + * RCS: @(#) $Id: tkBind.c,v 1.38 2005/11/10 11:38:29 dkf Exp $ */ #include "tkPort.h" @@ -2691,7 +2691,9 @@ ChangeScreen( Tcl_DStringAppend(&cmd, dispName, -1); sprintf(screen, ".%d", screenIndex); Tcl_DStringAppend(&cmd, screen, -1); - code = Tcl_GlobalEval(interp, Tcl_DStringValue(&cmd)); + code = Tcl_EvalEx(interp, Tcl_DStringValue(&cmd), Tcl_DStringLength(&cmd), + TCL_EVAL_GLOBAL); + Tcl_DStringFree(&cmd); if (code != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (changing screen in event binding)"); diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index 07c4a26..73ea3a8 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextWind.c,v 1.15 2005/10/10 10:36:35 vincentdarley Exp $ + * RCS: @(#) $Id: tkTextWind.c,v 1.16 2005/11/10 11:38:29 dkf Exp $ */ #include "tk.h" @@ -926,6 +926,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars, Tcl_ResetResult(textPtr->interp); ewPtr->body.ew.tkwin = Tk_NameToWindow(textPtr->interp, Tcl_DStringValue(&name), textPtr->tkwin); + Tcl_DStringFree(&name); if (ewPtr->body.ew.tkwin == NULL) { goto createError; } |