summaryrefslogtreecommitdiffstats
path: root/generic/tkWindow.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-04-03 13:24:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-04-03 13:24:39 (GMT)
commit72bb6b7e8fa3901fea62ff5f5b6a1686c28d4fe0 (patch)
tree0216a9e014a1edd19fff7c344e2256d3528f10c0 /generic/tkWindow.c
parentf81af507f29583a0e62ea74b132529376731c7e4 (diff)
downloadtk-72bb6b7e8fa3901fea62ff5f5b6a1686c28d4fe0.zip
tk-72bb6b7e8fa3901fea62ff5f5b6a1686c28d4fe0.tar.gz
tk-72bb6b7e8fa3901fea62ff5f5b6a1686c28d4fe0.tar.bz2
merge release to 8.5; revert features not included in release
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r--generic/tkWindow.c6
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
*/