summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-10 13:35:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-10 13:35:42 (GMT)
commit290f79c9005e4406f4e00249319730e87fb479bd (patch)
tree476e2a4c14720337454b381b82284d9109cb43ae
parent94bc46d46cbcb986f2da2451a7e557fb6cfd017b (diff)
downloadtk-290f79c9005e4406f4e00249319730e87fb479bd.zip
tk-290f79c9005e4406f4e00249319730e87fb479bd.tar.gz
tk-290f79c9005e4406f4e00249319730e87fb479bd.tar.bz2
* generic/tkConsole.c: Revise all Tcl_InitStubs() calls to restore
* generic/tkMain.c: the traditional practice that a Tk shared * generic/tkWindow.c: library may [load] into a Tcl 8.5 interp at any patchlevel. This practice also matches the compile time checks of TCL_MAJOR_VERSION and TCL_MINOR_VERSION in tk.h. [Bug 1723622]
-rw-r--r--ChangeLog8
-rw-r--r--generic/tkConsole.c4
-rw-r--r--generic/tkMain.c4
-rw-r--r--generic/tkWindow.c4
4 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b842e15..724f9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-10 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tkConsole.c: Revise all Tcl_InitStubs() calls to restore
+ * generic/tkMain.c: the traditional practice that a Tk shared
+ * generic/tkWindow.c: library may [load] into a Tcl 8.5 interp at
+ any patchlevel. This practice also matches the compile time checks
+ of TCL_MAJOR_VERSION and TCL_MINOR_VERSION in tk.h. [Bug 1723622]
+
2007-09-06 Don Porter <dgp@users.sourceforge.net>
* generic/tkWindow.c (Initialize): Moved common Tk initialization
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 30064c7..1996825 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.31 2006/09/22 19:02:07 andreas_kupries Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.32 2007/09/10 13:35:42 dgp Exp $
*/
#include "tk.h"
@@ -233,7 +233,7 @@ Tk_InitConsoleChannels(
* 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 ee9f004..3f15415 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.24 2007/09/07 00:34:53 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.25 2007/09/10 13:35:42 dgp Exp $
*/
#include <ctype.h>
@@ -110,7 +110,7 @@ Tk_MainEx(
* 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 1290ba4..541b533 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -11,7 +11,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.82 2007/09/07 00:34:54 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.83 2007/09/10 13:35:42 dgp Exp $
*/
#include "tkInt.h"
@@ -2948,7 +2948,7 @@ Initialize(
* 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;
}