diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-11 11:48:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-11 11:48:38 (GMT) |
| commit | cfce00e636e389f48c32d61c5483a913a0a9d656 (patch) | |
| tree | c9a801ef36f2cf95b58dcb55dd72e10ecfe02f67 /win | |
| parent | 6b32cafc8e54ed1a7bee854a77191c18186d905e (diff) | |
| parent | fa87897c16b0dc6d903c1be0dc80389d9cd072e3 (diff) | |
| download | tk-cfce00e636e389f48c32d61c5483a913a0a9d656.zip tk-cfce00e636e389f48c32d61c5483a913a0a9d656.tar.gz tk-cfce00e636e389f48c32d61c5483a913a0a9d656.tar.bz2 | |
Eliminate all usage of deprecated Tcl_EvalObj, Tcl_GlobalEval and Tcl_GlobalEvalObj functions.
Add [file normalize] to pkgIndex.tcl, in order to prevent '..' in file paths.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rw-r--r-- | win/tkWinScrlbr.c | 2 | ||||
| -rw-r--r-- | win/tkWinWm.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 787dc30..5c45112 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -486,12 +486,12 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\ + echo "if {[catch {package present Tcl 8.6.0}]} return";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\ echo "} else {";\ - echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]] Tk]";\ echo "}";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c index 1fd5e13..a280626 100644 --- a/win/tkWinScrlbr.c +++ b/win/tkWinScrlbr.c @@ -552,7 +552,7 @@ ScrollbarProc( } interp = scrollPtr->info.interp; - code = Tcl_GlobalEval(interp, cmdString.string); + code = Tcl_EvalEx(interp, cmdString.string, -1, TCL_EVAL_GLOBAL); if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) { Tcl_AddErrorInfo(interp, "\n (scrollbar command)"); Tcl_BackgroundException(interp, code); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index dc5d4d9..040a712 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -6615,7 +6615,7 @@ TkWmProtocolEventProc( Tcl_Preserve(protPtr); interp = protPtr->interp; Tcl_Preserve(interp); - result = Tcl_GlobalEval(interp, protPtr->command); + result = Tcl_EvalEx(interp, protPtr->command, -1, TCL_EVAL_GLOBAL); if (result != TCL_OK) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (command for \"%s\" window manager protocol)", |