summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2006-09-25 17:28:20 (GMT)
committerandreas_kupries <akupries@shaw.ca>2006-09-25 17:28:20 (GMT)
commit16dd0f69842fc8f2155b68584dcefe10e7c4a469 (patch)
tree9559a7b3b52052bd43516eb4b4585cc0640d6675 /generic
parent0565f643d88c9186f8e6534e8ccf4680c5aacbfc (diff)
downloadtk-16dd0f69842fc8f2155b68584dcefe10e7c4a469.zip
tk-16dd0f69842fc8f2155b68584dcefe10e7c4a469.tar.gz
tk-16dd0f69842fc8f2155b68584dcefe10e7c4a469.tar.bz2
* generic/tkConsole.c: Complete reversal of the changes of Sep 22.
* generic/tkMain.c: For compat reason the Tcl core will not change * generic/tkWindow.c: the registered version to include the patchlevel, * library/tk.tcl: making the changes to Tk unnecessary. * unix/configure: * unix/Makefile.in: * unix/tcl.m4: * win/configure: * win/Makefile.in: * win/makefile.vc: * win/rules.vc: * win/tcl.m4:
Diffstat (limited to 'generic')
-rw-r--r--generic/tkConsole.c4
-rw-r--r--generic/tkMain.c4
-rw-r--r--generic/tkWindow.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 0aadf8b..13e755e 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkConsole.c,v 1.18.2.5 2006/09/22 19:01:50 andreas_kupries Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.18.2.6 2006/09/25 17:28:20 andreas_kupries Exp $
*
*/
@@ -240,7 +240,7 @@ Tk_InitConsoleChannels(interp)
* really only an issue when Tk is loaded dynamically.
*/
- if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) {
+ if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
return;
}
diff --git a/generic/tkMain.c b/generic/tkMain.c
index fdc78c6..0e87228 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMain.c,v 1.15.2.4 2006/09/22 19:01:50 andreas_kupries Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.15.2.5 2006/09/25 17:28:20 andreas_kupries Exp $
*/
#include <ctype.h>
@@ -117,7 +117,7 @@ Tk_MainEx(argc, argv, appInitProc, interp)
* really only an issue when Tk is loaded dynamically.
*/
- if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) {
+ if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
abort();
}
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index e6918b4..eb21177 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWindow.c,v 1.56.2.13 2006/09/22 19:01:50 andreas_kupries Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.56.2.14 2006/09/25 17:28:20 andreas_kupries Exp $
*/
#include "tkPort.h"
@@ -2945,7 +2945,7 @@ Initialize(interp)
* really only an issue when Tk is loaded dynamically.
*/
- if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) {
+ if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
return TCL_ERROR;
}
@@ -3167,7 +3167,7 @@ Initialize(interp)
geometry = NULL;
}
- if (Tcl_PkgRequire(interp, "Tcl", TCL_PATCH_LEVEL, 1) == NULL) {
+ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
code = TCL_ERROR;
goto done;
}
@@ -3176,7 +3176,7 @@ Initialize(interp)
* Provide Tk and its stub table.
*/
- code = Tcl_PkgProvideEx(interp, "Tk", TK_PATCH_LEVEL, (ClientData) &tkStubs);
+ code = Tcl_PkgProvideEx(interp, "Tk", TK_VERSION, (ClientData) &tkStubs);
if (code != TCL_OK) {
goto done;
} else {