summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-15 16:58:13 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-15 16:58:13 (GMT)
commitfac19b4be19cadfe6aa84116dbdd20a3052e6af8 (patch)
treea3814ae175937a50238675da89530a4df2430c83 /generic
parent43d95f224b683fa86c4b4620c750bd4b73a41e14 (diff)
parente2b504bf3a2dc5aabd16dd640f75e87553dcf25a (diff)
downloadtk-fac19b4be19cadfe6aa84116dbdd20a3052e6af8.zip
tk-fac19b4be19cadfe6aa84116dbdd20a3052e6af8.tar.gz
tk-fac19b4be19cadfe6aa84116dbdd20a3052e6af8.tar.bz2
Don't use deprecated "case" any more.
Don't do unnecessary Tcl_PkgRequire(..., "Tcl", ...), the preceding Tcl_InitStubs() call already does that, both for dynamic loaded as wel as the static case. Disallow Tk 8.5.x to be loaded in any Tcl 8.5 alpha release.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkConsole.c2
-rw-r--r--generic/tkMain.c2
-rw-r--r--generic/tkWindow.c10
3 files changed, 4 insertions, 10 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 621d125..bf86f8f 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -224,7 +224,7 @@ Tk_InitConsoleChannels(
* only an issue when Tk is loaded dynamically.
*/
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) {
return;
}
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 74b8557..4d348ef 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -136,7 +136,7 @@ Tk_MainEx(
* only an issue when Tk is loaded dynamically.
*/
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) {
abort();
}
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 417d16b..057be04 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3021,11 +3021,10 @@ Initialize(
ThreadSpecificData *tsdPtr;
/*
- * Ensure that we are getting the matching version of Tcl. This is really
- * only an issue when Tk is loaded dynamically.
+ * Ensure that we are getting the matching version of Tcl.
*/
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) {
return TCL_ERROR;
}
@@ -3257,11 +3256,6 @@ Initialize(
geometry = NULL;
}
- if (Tcl_PkgRequire(interp, "Tcl", "8.5", 0) == NULL) {
- code = TCL_ERROR;
- goto done;
- }
-
/*
* Provide Tk and its stub table.
*/