diff options
author | dgp <dgp@users.sourceforge.net> | 2013-04-03 13:24:39 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2013-04-03 13:24:39 (GMT) |
commit | 6c3188baaf39b816f6804c3d57cb70368384cab0 (patch) | |
tree | 0216a9e014a1edd19fff7c344e2256d3528f10c0 /generic/tkWindow.c | |
parent | f2d23fc648c74066e46c078fb8d4e795d9fcaf41 (diff) | |
download | tk-6c3188baaf39b816f6804c3d57cb70368384cab0.zip tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.gz tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.bz2 |
merge release to 8.5; revert features not included in release
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r-- | generic/tkWindow.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index d40e7de..ac69455 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3024,7 +3024,7 @@ Initialize( * Ensure that we are getting a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, TCL_VERSION ".0", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { return TCL_ERROR; } @@ -3275,6 +3275,10 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); +#undef Tk_InitStubs + + Tk_InitStubs(interp, TK_VERSION, 1); + /* * Initialized the themed widget set */ |