diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 16:58:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 16:58:13 (GMT) |
| commit | fac19b4be19cadfe6aa84116dbdd20a3052e6af8 (patch) | |
| tree | a3814ae175937a50238675da89530a4df2430c83 /generic/tkWindow.c | |
| parent | 43d95f224b683fa86c4b4620c750bd4b73a41e14 (diff) | |
| parent | e2b504bf3a2dc5aabd16dd640f75e87553dcf25a (diff) | |
| download | tk-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/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 10 |
1 files changed, 2 insertions, 8 deletions
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. */ |