summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tk.h6
-rw-r--r--library/tk.tcl6
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 45665f1..b5e077b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-06-19 Don Porter <dgp@users.sourceforge.net>
+ * generic/tk.h: TIP 285 additions make Tk 8.6 call the new
+ * library/tk.tcl: Tcl_Canceled() routine, available only in
+ Tcl 8.6, so bump our Tcl dependencies to version 8.6. Tk 8.6a1 will
+ no longer [load] into a Tcl 8.5 interp.
+
* README: Bump version number to 8.6a1
* generic/tk.h:
* library/tk.tcl:
diff --git a/generic/tk.h b/generic/tk.h
index 161139e..a4e8ca7 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,15 +12,15 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tk.h,v 1.111 2008/06/19 19:37:58 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.112 2008/06/19 19:48:26 dgp Exp $
*/
#ifndef _TK
#define _TK
#include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 5)
-# error Tk 8.6 must be compiled with tcl.h from Tcl 8.5 or better
+#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
+# error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif
/*
diff --git a/library/tk.tcl b/library/tk.tcl
index 935b555..7ecf22e 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
# Initialization script normally executed in the interpreter for each
# Tk-based application. Arranges class bindings for widgets.
#
-# RCS: @(#) $Id: tk.tcl,v 1.76 2008/06/19 19:37:59 dgp Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.77 2008/06/19 19:48:26 dgp Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -12,10 +12,8 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp
- ;# before using 8.5 [package] features.
# Insist on running with compatible version of Tcl
-package require Tcl 8.5.0
+package require Tcl 8.6
# Verify that we have Tk binary and script components from the same release
package require -exact Tk 8.6a1