diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 17:18:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 17:18:10 (GMT) |
| commit | 4685a0baf91fcffa9d13e52a83693ddde434a031 (patch) | |
| tree | 3c2c896fb9fe907582ccadf3be17be4cc255dd7f /generic/tkWindow.c | |
| parent | 0b9e60051d8b56808f7674686838055b264485f1 (diff) | |
| parent | fac19b4be19cadfe6aa84116dbdd20a3052e6af8 (diff) | |
| download | tk-4685a0baf91fcffa9d13e52a83693ddde434a031.zip tk-4685a0baf91fcffa9d13e52a83693ddde434a031.tar.gz tk-4685a0baf91fcffa9d13e52a83693ddde434a031.tar.bz2 | |
More flexible search for win32 tclConfig.sh, backported from TEA.
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.6.x to be loaded in any Tcl 8.6 alpha/beta 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 db9b40f..a283855 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3047,11 +3047,10 @@ Initialize( ThreadSpecificData *tsdPtr; /* - * Ensure that we are getting a compatible 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.6", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.6.0", 0) == NULL) { return TCL_ERROR; } @@ -3287,11 +3286,6 @@ Initialize( geometry = NULL; } - if (Tcl_PkgRequire(interp, "Tcl", "8.6", 0) == NULL) { - code = TCL_ERROR; - goto done; - } - /* * Provide Tk and its stub table. */ |