diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:11:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:11:22 (GMT) |
| commit | 799b9f787adc4145bcf9d3834de9656e0b93f04c (patch) | |
| tree | 398503485909642466d8b09fb3aca93606f46b57 /generic/tkWindow.c | |
| parent | c8f45542bbffa9d476314be5fdafc6dc87216641 (diff) | |
| parent | 1e43f52d3f5a853bf95be27798ace31ea8ee2884 (diff) | |
| download | tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.zip tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.tar.gz tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.tar.bz2 | |
merge trunk
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 79f0ae3..929136d 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 a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, TCL_VERSION, 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", TCL_VERSION, 0) == NULL) { - code = TCL_ERROR; - goto done; - } - /* * Provide Tk and its stub table. */ |