diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-01-15 16:58:13 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-01-15 16:58:13 (GMT) |
| commit | 7b4b067a9ed86c42cae861bd5e3f9e605a660e06 (patch) | |
| tree | 89b665fd3ad7c4b1874f9a51e38d7fcac17c4b28 /generic/tkWindow.c | |
| parent | 66eae1830b335f3ca0d36b16ca085860790a8e7f (diff) | |
| parent | 0a93ff61541376329acefdac9e9f536437626e96 (diff) | |
| download | tk-7b4b067a9ed86c42cae861bd5e3f9e605a660e06.zip tk-7b4b067a9ed86c42cae861bd5e3f9e605a660e06.tar.gz tk-7b4b067a9ed86c42cae861bd5e3f9e605a660e06.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. */ |