summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-11 09:51:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-11 09:51:01 (GMT)
commit0e5b62601e1b369ad78f4eee43d473e74702cbd6 (patch)
treee608d2723552872785a3a140b3d4098636edfeae /win
parent1d53b374aa101c0a5fe079f6e1ead45b64204af9 (diff)
downloadtk-0e5b62601e1b369ad78f4eee43d473e74702cbd6.zip
tk-0e5b62601e1b369ad78f4eee43d473e74702cbd6.tar.gz
tk-0e5b62601e1b369ad78f4eee43d473e74702cbd6.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. Remove unused TCLPATCHL, it should be ".0" for all final releases.
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in13
-rw-r--r--win/tkWinScrlbr.c2
-rw-r--r--win/tkWinWm.c2
3 files changed, 8 insertions, 9 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index b4a06a0..1c47ad2 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,6 @@
# actual Makefile.
TCLVERSION = @TCL_VERSION@
-TCLPATCHL = @TCL_PATCH_LEVEL@
VERSION = @TK_VERSION@
#----------------------------------------------------------------
@@ -143,7 +142,7 @@ MAN2TCL = man2tcl$(EXEEXT)
@SET_MAKE@
-# Setting the VPATH variable to a list of paths will cause the
+# Setting the VPATH variable to a list of paths will cause the
# makefile to look into these paths when resolving .c to .obj
# dependencies.
@@ -366,7 +365,7 @@ SHELL_ENV = \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH;
-# Main targets. The default target -- all -- builds the binaries,
+# Main targets. The default target -- all -- builds the binaries,
# performs any post processing on libraries or documents.
all: binaries libraries doc
@@ -437,15 +436,15 @@ install-binaries: binaries
$(COPY) $$i "$(BIN_INSTALL_DIR)"; \
fi; \
done
- @echo "Creating package index $(PKG_INDEX)";
+ @echo "Creating package index $(PKG_INDEX)";
@$(RM) $(PKG_INDEX);
@(\
- echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
+ echo "if {[package vcompare [package provide Tcl] 8.4] != 0} return";\
echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
echo " || ([info exists ::argv] && [lsearch -exact \$$::argv -display] > -1))} {";\
- echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\
+ echo " package ifneeded Tk $(VERSION) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\
echo "} else {";\
- echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\
+ echo " package ifneeded Tk $(VERSION) [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 130daa6..2145ff0 100644
--- a/win/tkWinScrlbr.c
+++ b/win/tkWinScrlbr.c
@@ -582,7 +582,7 @@ ScrollbarProc(hwnd, message, wParam, lParam)
}
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_BackgroundError(interp);
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 32768cf..b8dfd8d 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -6123,7 +6123,7 @@ TkWmProtocolEventProc(winPtr, eventPtr)
Tcl_Preserve((ClientData) protPtr);
interp = protPtr->interp;
Tcl_Preserve((ClientData) interp);
- result = Tcl_GlobalEval(interp, protPtr->command);
+ result = Tcl_EvalEx(interp, protPtr->command, -1, TCL_EVAL_GLOBAL);
if (result != TCL_OK) {
Tcl_AddErrorInfo(interp, "\n (command for \"");
Tcl_AddErrorInfo(interp, name);