summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--changes22
-rw-r--r--generic/tk.h4
-rw-r--r--library/tk.tcl2
-rwxr-xr-xunix/configure14
-rw-r--r--unix/configure.in2
-rw-r--r--unix/tk.spec2
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
9 files changed, 37 insertions, 15 deletions
diff --git a/README b/README
index 5551ebd..6fad4bb 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
README: Tk
- This is the Tk 8.5.17 source distribution.
+ This is the Tk 8.5.18 source distribution.
http://sourceforge.net/projects/tcl/files/Tcl/
You can get any source release of Tk from the URL above.
diff --git a/changes b/changes
index 3d490d9..e354f2f 100644
--- a/changes
+++ b/changes
@@ -6965,3 +6965,25 @@ Many revisions to better support a Cygwin environment (nijtmans)
2014-10-14 (bug)[fb35eb] fix PNG transparency appearance (walton,culler)
--- Released 8.5.17, October 25, 2014 --- http://core.tcl.tk/tk/ for details
+
+2014-10-26 Support for Windows 10 (nijtmans)
+
+2014-10-28 (bug) OSX: Improved ttk notebook tab metrics for Yosemite (walzer)
+
+2014-10-30 (bug)[3417012] [scale -digits $bigValue] segfault (vogel)
+
+2014-11-06 (bug)[9d72dc] memleak in Cocoa buttons (revol)
+
+2014-11-07 (bug)[3529885] [scale] handling of negative resolution (vogel)
+
+2015-01-02 (bug) Stop bit loss in [winfo id] on 64-bit Cocoa (porter)
+
+2015-02-06 (bug) several fixes to elided context in [text] (vogel)
+
+2015-02-06 (new feature)[TIP 433] %M binding substitution (mistachkin)
+ *** POTENTIAL INCOMPATIBILITY ***
+
+Tk Cocoa 2.0: App Store enabled (walzer,culler,desmera,owen,nyberg,reincke)
+ *** POTENTIAL INCOMPATIBILITY ***
+
+--- Released 8.5.18, February 28, 2015 --- http://core.tcl.tk/tk/ for details
diff --git a/generic/tk.h b/generic/tk.h
index 186732b..e356ce5 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -59,10 +59,10 @@ extern "C" {
#define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 5
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL 17
+#define TK_RELEASE_SERIAL 18
#define TK_VERSION "8.5"
-#define TK_PATCH_LEVEL "8.5.17"
+#define TK_PATCH_LEVEL "8.5.18"
/*
* A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index 3dae5d4..a9db8cb 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -15,7 +15,7 @@ package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp before
# Insist on running with compatible version of Tcl
package require Tcl 8.5.0
# Verify that we have Tk binary and script components from the same release
-package require -exact Tk 8.5.17
+package require -exact Tk 8.5.18
# Create a ::tk namespace
namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 6a053d9..e1079fc 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".17"
+TK_PATCH_LEVEL=".18"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
@@ -10008,7 +10008,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10016,7 +10016,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -10043,7 +10043,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -10057,18 +10057,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
diff --git a/unix/configure.in b/unix/configure.in
index 7be1791..bab5d8a 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".17"
+TK_PATCH_LEVEL=".18"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
diff --git a/unix/tk.spec b/unix/tk.spec
index 32c0520..fd51c52 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -4,7 +4,7 @@
Name: tk
Summary: Tk graphical toolkit for the Tcl scripting language.
-Version: 8.5.17
+Version: 8.5.18
Release: 2
License: BSD
Group: Development/Languages
diff --git a/win/configure b/win/configure
index 7a009e7..35f57ca 100755
--- a/win/configure
+++ b/win/configure
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".17"
+TK_PATCH_LEVEL=".18"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 78cc2e7..4634bb6 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".17"
+TK_PATCH_LEVEL=".18"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------