Merge updates from HEAD, then

[core-stabilizer-branch] * README: Bump version number to 8.5.0 * generic/tk.h: * library/tk.tcl: * unix/configure.in: Updated LOCALES. * unix/tk.spec: * win/configure.in: * unix/configure: autoconf (2.59) * win/configure:
author: dgp <dgp@users.sourceforge.net> 2007-10-02 20:43:52 (GMT)
committer: dgp <dgp@users.sourceforge.net> 2007-10-02 20:43:52 (GMT)
commit: acce2990f96bc2da819f72e4a14584b80617d457 (patch)
tree: 4693d55f344f29e16501f8171e4053ad09e4cb7a
parent: 866c5d22436853398b078226064f655c6dd69eea (diff)
download: tk-acce2990f96bc2da819f72e4a14584b80617d457.zip
tk-acce2990f96bc2da819f72e4a14584b80617d457.tar.gz
tk-acce2990f96bc2da819f72e4a14584b80617d457.tar.bz2
15 files changed, 226 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index ae42790..9734415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2007-10-02  Don Porter  <dgp@users.sourceforge.net>
+
+	[core-stabilizer-branch]
+
+	* README:               Bump version number to 8.5.0
+	* generic/tk.h:
+	* library/tk.tcl:
+	* unix/configure.in:	Updated LOCALES.
+	* unix/tk.spec:
+	* win/configure.in:
+
+	* unix/configure:	autoconf (2.59)
+	* win/configure:
+
+2007-09-30  Joe English  <jenglish@users.sourceforge.net>
+
+	* library/ttk/entry.tcl (WordBack, WordForward):
+	Fix private routines accidentally defined in global namespace
+	[Bug 1803836]
+
+2007-09-26  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
+
+	* library/msgs/hu.msg: Added Hungarian message set, from Pader Reszo.
+	[Patch 1800742]
+
+2007-09-20  Donal K. Fellows  <dkf@users.sf.net>
+
+	*** 8.5b1 TAGGED FOR RELEASE ***
+
+	* generic/tkTextDisp.c (LayoutDLine):  Only call callbacks that are
+	* tests/textDisp.test (textDisp-32.3): not NULL. [Bug 1791052]
+
+2007-09-20  Don Porter  <dgp@users.sourceforge.net>
+
+	* changes: updates for 8.5b1 release.
+
+2007-09-19  Don Porter  <dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.5b1.
+	* generic/tk.h:		Merge from core-stabilizer-branch.
+	* library/tk.tcl:	Stabilizing toward 8.5b1 release now done
+	* unix/configure.in:	on the HEAD.  core-stabilizer-branch is
+	* unix/tk.spec:		now suspended.
+	* win/configure.in:
+
 2007-09-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* generic/tkStubLib.: Replaced isdigit with internal implementation.
diff --git a/README b/README
index ca42e01..392b538 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.5b1 source distribution.
+    This is the Tk 8.5.0 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.47.2.1 2007/05/22 20:34:52 dgp Exp $
+RCS: @(#) $Id: README,v 1.47.2.2 2007/10/02 20:43:52 dgp Exp $
 
 1. Introduction
 ---------------
diff --git a/changes b/changes
index 0f8d294..144880c 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.107.2.1 2007/09/19 17:28:21 dgp Exp $
+RCS: @(#) $Id: changes,v 1.107.2.2 2007/10/02 20:43:52 dgp Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -6326,35 +6326,57 @@ to Wish.app's Info.plist.
 
 --- Released 8.5a6, April 25, 2007 --- See ChangeLog for details ---
 
+2007-05-04 (new feature)[TIP 145] Enhanced font handling (thoyts)
+
+2007-05-14 (bug fix)[1712081] restored USE_OLD_IMAGE support (porter)
+
+2007-05-15 (bug fix)[1717830,800149] memory leaks (jenglish)
+
+2007-05-15 (bug fix)[1677608] [grid *configure] crash (porter)
+
 2007-05-31 (platform support) Aqua: improve interaction of Expose events and
-idle-time redraws.
+idle-time redraws (steffen)
 
-2007-05-31 (bug fix) Aqua: gridded window max-size calculation.
+2007-05-31 (bug fix) Aqua: gridded window max-size calculation (steffen)
 
-2007-06-02 (bug fix)[1731734] Aqua: menu cascades outside menubar.
+2007-06-02 (bug fix)[1731734] Aqua: menu cascades outside menubar (steffen)
 
 2007-06-06 (platform support) Aqua: enable MouseWheel events in background
-windows.
+windows (steffen)
+
+2007-06-09 (bug fix)[1724223] Unicode menu entry crash (hobbs)
 
-2007-06-23 (bug fix) Aqua: nav dialog sheet crash.
+2007-06-09 (bug fix)[1467997] Blue/red reversal in icons (hobbs,janssen)
+
+2007-06-23 (bug fix) Aqua: nav dialog sheet crash (steffen)
 
 2007-06-29 (platform support) Aqua: remove private internal declarations from
-installed tkMacOSXInt.h header.
+installed tkMacOSXInt.h header (steffen)
 
-2007-06-29 (bug fix) Aqua: scrollbar thumb size calculation.
+2007-06-29 (bug fix) Aqua: scrollbar thumb size calculation (steffen)
 
-2007-07-09 (bug fix) Aqua: app-is-frontmost detection.
+2007-07-09 (bug fix) Aqua: app-is-frontmost detection (steffen)
 
 2007-07-09 (bug fix) Aqua: window click activation & titlebar click handling
-in presence of grabs or modal windows.
+in presence of grabs or modal windows (steffen)
+
+2007-07-25 (bug fix)[1743786] Aqua: tk_getOpenFile result (steffen)
 
-2007-07-25 (bug fix)[1743786] Aqua: tk_getOpenFile result.
+2007-08-01 (bug fix)[1692927] [tk_messageBox -detail] buffer (davies,thoyts)
 
-2007-08-27 (bug fix)[1782105] Aqua: tk_chooseColor result.
+2007-08-27 (bug fix)[1782105] Aqua: tk_chooseColor result (steffen)
 
 2007-09-06 (platform support) Aqua: drop support for Xcode 1.5 project, add
-project for Xcode 3.0.
+project for Xcode 3.0 (steffen)
+
+2007-09-11 (bug fix) Animated GIF buffer overrun (max)
+
+2007-09-15 (platform support) SunOS-5.1x link with cc, not ld (steffen)
+
+2007-09-17 (enhancement)[1780286] Aqua: combobox appearance (english)
+
+2007-09-17 (platform support)[1748251] Fix NetBSD link failures (english)
 
-2007-09-15 (platform support) SunOS-5.1x link with cc, not ld.
+2007-09-20 (bug fix)[1791052] [text] DLine layout crash (khomoutov,fellows)
 
---- Released 8.5b1, September ??, 2007 --- See ChangeLog for details ---
+--- Released 8.5b1, September 26, 2007 --- See ChangeLog for details ---
diff --git a/generic/tk.decls b/generic/tk.decls
index 5136906..18a74ee 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -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: tk.decls,v 1.32 2007/05/16 21:21:35 das Exp $
+# RCS: @(#) $Id: tk.decls,v 1.32.2.1 2007/10/02 20:43:53 dgp Exp $
 
 library tk
 
@@ -1386,6 +1386,8 @@ declare 10 aqua {
 # complain about them) 
 
 # const char *Tk_InitStubs(Tcl_Interp *interp, const char *version, int exact)
+# const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
+#	int exact);
 
 # Global variables that need to be exported from the tcl shared library:
 # (listed here _as comments_ so that the 'checkstubs' make target does not 
diff --git a/generic/tk.h b/generic/tk.h
index 422e985..e9cccc6 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -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: tk.h,v 1.98.2.3 2007/09/17 15:22:00 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.98.2.4 2007/10/02 20:43:53 dgp Exp $
  */
 
 #ifndef _TK
@@ -52,11 +52,11 @@ extern "C" {
 
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	5
-#define TK_RELEASE_LEVEL	TCL_BETA_RELEASE
-#define TK_RELEASE_SERIAL	1
+#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
+#define TK_RELEASE_SERIAL	0
 
 #define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5b1"
+#define TK_PATCH_LEVEL		"8.5.0"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index c935010..2582666 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.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: tkTextDisp.c,v 1.63.2.2 2007/09/07 01:25:36 dgp Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.63.2.3 2007/10/02 20:43:53 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -1551,6 +1551,7 @@ LayoutDLine(
 		 */
 
 		TkTextLine *linePtr = TkBTreeNextLine(NULL, curIndex.linePtr);
+
 		if (linePtr != NULL) {
 		    dlPtr->logicalLinesMerged++;
 		    curIndex.byteIndex = 0;
@@ -1609,11 +1610,15 @@ LayoutDLine(
 	    }
 	    FreeStyle(textPtr, chunkPtr->stylePtr);
 	    breakChunkPtr->nextPtr = chunkPtr->nextPtr;
-	    (*chunkPtr->undisplayProc)(textPtr, chunkPtr);
+	    if (chunkPtr->undisplayProc != NULL) {
+		(*chunkPtr->undisplayProc)(textPtr, chunkPtr);
+	    }
 	    ckfree((char *) chunkPtr);
 	}
 	if (breakByteOffset != breakChunkPtr->numBytes) {
-	    (*breakChunkPtr->undisplayProc)(textPtr, breakChunkPtr);
+	    if (breakChunkPtr->undisplayProc != NULL) {
+		(*breakChunkPtr->undisplayProc)(textPtr, breakChunkPtr);
+	    }
 	    segPtr = TkTextIndexToSeg(&breakIndex, &byteOffset);
 	    (*segPtr->typePtr->layoutProc)(textPtr, &breakIndex,
 		    segPtr, byteOffset, maxX, breakByteOffset, 0,
diff --git a/library/msgs/hu.msg b/library/msgs/hu.msg
new file mode 100644
index 0000000..fc4700f
--- /dev/null
+++ b/library/msgs/hu.msg
@@ -0,0 +1,77 @@
+namespace eval ::tk {
+    ::msgcat::mcset hu "&Abort" "&Megszak\u00edt\u00e1s"
+    ::msgcat::mcset hu "About..." "N\u00e9vjegy..."
+    ::msgcat::mcset hu "All Files" "Minden f\u00e1jl"
+    ::msgcat::mcset hu "All Files (*) " "Minden f\u00e1jl (*) "
+    ::msgcat::mcset hu "Application Error" "Alkalmaz\u00e1s hiba"
+    ::msgcat::mcset hu "&Blue" "&K\u00e9k"
+    ::msgcat::mcset hu "&Cancel" "M\u00e9g&sem"
+    ::msgcat::mcset hu "Cannot change to the directory \"%1\$s\".\nPermission denied." "A k\u00f6nyvt\u00e1rv\u00e1lt\u00e1s nem siker\u00fclt: \"%1\$s\".\nHozz\u00e1f\u00e9r\u00e9s megtagadva."
+    ::msgcat::mcset hu "Choose Directory" "K\u00f6nyvt\u00e1r kiv\u00e1laszt\u00e1sa"
+    ::msgcat::mcset hu "Clear" "T\u00f6rl\u00e9s"
+    ::msgcat::mcset hu "&Clear Console" "&T\u00f6rl\u00e9s Konzol"
+    ::msgcat::mcset hu "Color" "Sz\u00edn"
+    ::msgcat::mcset hu "Console" "Konzol"
+    ::msgcat::mcset hu "&Copy" "&M\u00e1sol\u00e1s"
+    ::msgcat::mcset hu "Cu&t" "&Kiv\u00e1g\u00e1s"
+    ::msgcat::mcset hu "&Delete" "&T\u00f6rl\u00e9s"
+    ::msgcat::mcset hu "Details >>" "R\u00e9szletek >>"
+    ::msgcat::mcset hu "Directory \"%1\$s\" does not exist." "\"%1\$s\" k\u00f6nyvt\u00e1r nem l\u00e9tezik."
+    ::msgcat::mcset hu "&Directory:" "&K\u00f6nyvt\u00e1r:"
+    #::msgcat::mcset hu "&Edit"
+    ::msgcat::mcset hu "Error: %1\$s" "Hiba: %1\$s"
+    ::msgcat::mcset hu "E&xit" "Kil\u00e9p\u00e9s"
+    ::msgcat::mcset hu "&File" "&F\u00e1jl"
+    ::msgcat::mcset hu "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\nFel\u00fcl\u00edrjam?"
+    ::msgcat::mcset hu "File \"%1\$s\" already exists.\n\n" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\n\n"
+    ::msgcat::mcset hu "File \"%1\$s\" does not exist." "\"%1\$s\" f\u00e1jl nem l\u00e9tezik."
+    ::msgcat::mcset hu "File &name:" "F\u00e1jl &neve:"
+    ::msgcat::mcset hu "File &names:" "F\u00e1jlok &nevei:"
+    ::msgcat::mcset hu "Files of &type:" "F\u00e1jlok &t\u00edpusa:"
+    ::msgcat::mcset hu "Fi&les:" "F\u00e1j&lok:"
+    ::msgcat::mcset hu "&Filter" "&Sz\u0171r\u0151"
+    ::msgcat::mcset hu "Fil&ter:" "S&z\u0171r\u0151:"
+    ::msgcat::mcset hu "&Green" "&Z\u00f6ld"
+    #::msgcat::mcset hu "&Help"
+    ::msgcat::mcset hu "Hi" "\u00dcdv"
+    ::msgcat::mcset hu "&Hide Console" "Konzol &elrejt\u00e9se"
+    ::msgcat::mcset hu "&Ignore" "K&ihagy\u00e1s"
+    ::msgcat::mcset hu "Invalid file name \"%1\$s\"." "\u00c9rv\u00e9nytelen f\u00e1jln\u00e9v: \"%1\$s\"."
+    ::msgcat::mcset hu "Log Files" "Log f\u00e1jlok"
+    ::msgcat::mcset hu "&No" "&Nem"
+    ::msgcat::mcset hu "&OK"
+    ::msgcat::mcset hu "OK"
+    ::msgcat::mcset hu "Open" "Megnyit\u00e1s"
+    ::msgcat::mcset hu "&Open" "&Megnyit\u00e1s"
+    ::msgcat::mcset hu "Open Multiple Files" "T\u00f6bb f\u00e1jl megnyit\u00e1sa"
+    ::msgcat::mcset hu "P&aste" "&Beilleszt\u00e9s"
+    ::msgcat::mcset hu "&Quit" "&Kil\u00e9p\u00e9s"
+    ::msgcat::mcset hu "&Red" "&V\u00f6r\u00f6s"
+    ::msgcat::mcset hu "Replace existing file?" "Megl\u00e9v\u0151 f\u00e1jl cser\u00e9je?"
+    ::msgcat::mcset hu "&Retry" "\u00daj&ra"
+    ::msgcat::mcset hu "&Save" "&Ment\u00e9s"
+    ::msgcat::mcset hu "Save As" "Ment\u00e9s m\u00e1sk\u00e9nt"
+    ::msgcat::mcset hu "Save To Log" "Ment\u00e9s log f\u00e1jlba"
+    ::msgcat::mcset hu "Select Log File" "Log f\u00e1jl kiv\u00e1laszt\u00e1sa"
+    ::msgcat::mcset hu "Select a file to source" "Forr\u00e1sf\u00e1jl kiv\u00e1laszt\u00e1sa"
+    ::msgcat::mcset hu "&Selection:" "&Kijel\u00f6l\u00e9s:"
+    ::msgcat::mcset hu "Show &Hidden Directories" "&Rejtett k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
+    ::msgcat::mcset hu "Show &Hidden Files and Directories" "&Rejtett f\u00e1jlok \u00e9s k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
+    ::msgcat::mcset hu "Skip Messages" "\u00dczenetek kihagy\u00e1sa"
+    ::msgcat::mcset hu "&Source..." "&Forr\u00e1s..."
+    ::msgcat::mcset hu "Tcl Scripts" "Tcl scriptek"
+    ::msgcat::mcset hu "Tcl for Windows" "Tcl Windows-hoz"
+    ::msgcat::mcset hu "Text Files" "Sz\u00f6vegf\u00e1jlok"
+    ::msgcat::mcset hu "&Yes" "&Igen"
+    ::msgcat::mcset hu "abort" "megszak\u00edt\u00e1s"
+    ::msgcat::mcset hu "blue" "k\u00e9k"
+    ::msgcat::mcset hu "cancel" "m\u00e9gsem"
+    ::msgcat::mcset hu "extension" "kiterjeszt\u00e9s"
+    ::msgcat::mcset hu "extensions" "kiterjeszt\u00e9sek"
+    ::msgcat::mcset hu "green" "z\u00f6ld"
+    ::msgcat::mcset hu "ignore" "ignorer"
+    ::msgcat::mcset hu "ok"
+    ::msgcat::mcset hu "red" "v\u00f6r\u00f6s"
+    ::msgcat::mcset hu "retry" "\u00fajra"
+    ::msgcat::mcset hu "yes" "igen"
+}
diff --git a/library/tk.tcl b/library/tk.tcl
index 49f522b..4a30f0d 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.63.2.2 2007/09/11 18:32:35 dgp Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.63.2.3 2007/10/02 20:43:53 dgp Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -17,7 +17,7 @@ package require Tcl 8.5	;# Guard against [source] in an 8.4- interp
 # Insist on running with compatible version of Tcl
 package require Tcl 8.5b1-8.6
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.5b1
+package require -exact Tk  8.5.0
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index 7d84be7..8aea139 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: entry.tcl,v 1.2 2006/11/07 03:45:28 jenglish Exp $
+# $Id: entry.tcl,v 1.2.2.1 2007/10/02 20:43:53 dgp Exp $
 #
 # DERIVED FROM: tk/library/entry.tcl r1.22
 #
@@ -452,11 +452,11 @@ proc ttk::entry::WordSelect {w from to} {
 
 ## WordBack, WordForward -- helper routines for WordSelect.
 #
-proc WordBack {text index} {
+proc ttk::entry::WordBack {text index} {
     if {[set pos [tcl_wordBreakBefore $text $index]] < 0} { return 0 }
     return $pos
 }
-proc WordForward {text index} {
+proc ttk::entry::WordForward {text index} {
     if {[set pos [tcl_wordBreakAfter $text $index]] < 0} { return end }
     return $pos
 }
diff --git a/tests/textDisp.test b/tests/textDisp.test
index aa99a43..dc9a31b 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textDisp.test,v 1.40 2006/03/23 16:26:12 dgp Exp $
+# RCS: @(#) $Id: textDisp.test,v 1.40.2.1 2007/10/02 20:43:53 dgp Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -3644,7 +3644,6 @@ test textDisp-32.0 {everything elided} {
     update ; update ; update ; update
     destroy .tt
 } {}
-
 test textDisp-32.1 {everything elided} {
     # Must not crash
     pack [text .tt]
@@ -3657,7 +3656,6 @@ test textDisp-32.1 {everything elided} {
     update ; update ; update ; update
     destroy .tt
 } {}
-
 test textDisp-32.2 {elide and tags} {
     pack [text .tt -height 30 -width 100 -bd 0 \
       -highlightthickness 0 -padx 0]
@@ -3675,7 +3673,6 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     # hide tag 1, remaining text should not be indented, since
     # the indented tag and character is hidden.
     .tt tag configure testtag1 -elide 1 ; update
@@ -3683,11 +3680,9 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     # reset
     .tt tag configure testtag1 -lmargin1 0
     .tt tag configure testtag1 -elide 0
-
     # indent left margin of tag 2 by 20 pixels
     # text should not be indented, since tag1 has lmargin1 of 0.
     .tt tag configure testtag2 -lmargin1 20 ; update
@@ -3695,7 +3690,6 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     # hide tag 1, remaining text should now be indented, but
     # the bbox of 1.0 should have zero width and zero indent,
     # since it is elided at that position.
@@ -3704,11 +3698,9 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     # reset
     .tt tag configure testtag2 -lmargin1 {}
     .tt tag configure testtag1 -elide 0
-
     # indent left margin of tag 3 by 20 pixels
     # text should be indented, since this tag takes
     # precedence over testtag1, and is applied to the
@@ -3718,7 +3710,6 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     # hide tag 1, remaining text should still be indented,
     # since it still has testtag3 on it.  Again the
     # bbox of 1.0 should have 0.
@@ -3727,18 +3718,44 @@ test textDisp-32.2 {elide and tags} {
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     .tt tag configure testtag3 -lmargin1 {} -elide 0
     .tt tag configure testtag1 -elide 1 -lmargin1 20
     #7
     lappend res [list [.tt index "1.0 + 0 displaychars"] \
       [lindex [.tt bbox 1.0] 0] \
       [lindex [.tt bbox "1.0 + 0 displaychars"] 0]]
-    
     destroy .tt
     set res
 } {{1.0 20 20} {1.29 0 0} {1.0 0 0} {1.29 0 20}\
   {1.0 20 20} {1.29 0 20} {1.0 20 20}}
+test textDisp-32.3 "NULL undisplayProc problems: #1791052" -setup {
+    set img [image create photo -data {
+	R0lGODlhEgASANUAAAAAAP/////iHP/mIPrWDPraEP/eGPfOAPbKAPbOBPrS
+	CP/aFPbGAPLCAPLGAN62ANauAMylAPbCAPW/APK+AN6uALKNAPK2APK5ANal
+	AOyzArGHBZp3B+6uAHFVBFVACO6qAOqqAOalAMGMAbF+Am1QBG5QBeuiAOad
+	AM6NAJ9vBW1MBFlACFQ9CVlBCuaZAOKVANyVAZlpBMyFAKZtBJVhBEAUEP//
+	/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADcALAAAAAASABIAAAa+
+	wJtw+Ckah0iiZwNhODKk0icp/HAShEKBoEBgVFOkK0Iw2GyCs+BAGbGIlrIt
+	EJjXBYgL6X3zJMx1Z2d3EyEmNx9xaYGCdwgaNEUPBYt0do4XKUUOlAOCnmcD
+	CwcXMZsEAgOqq6oLBY+mHxUKBqysCwQSIDNFJAidtgKjFyeRfRQHB2ipAmZs
+	IDArVSTIyoI2bB0oxkIsIxcNyeIXICh7SR8yIhoXFxogJzE1YegrNCkoLzM0
+	K/RUiEY+tKASBAA7
+    }]
+    destroy .tt
+} -body {
+    text .tt
+    .tt tag configure emoticon -elide 1
+    .tt insert end X
+    .tt mark set MSGLEFT "end - 1 char"
+    .tt mark gravity MSGLEFT left
+    .tt insert end ":)" emoticon
+    .tt image create end -image $img
+    pack .tt
+    update; update; update
+} -cleanup {
+    image delete $img
+    destroy .tt
+}
 
 test textDisp-33.0 {one line longer than fits in the widget} {
     pack [text .tt -wrap char]
diff --git a/unix/configure b/unix/configure
index 6a2b8f5..a2971fe 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1336,9 +1336,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b1"
+TK_PATCH_LEVEL=".0"
 VERSION=${TK_VERSION}
-LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru"
+LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
@@ -8780,7 +8780,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 Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8788,7 +8788,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8815,7 +8815,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -8829,18 +8829,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="-lXt $LIBS"
+  LIBS="-lX11 $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/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
diff --git a/unix/configure.in b/unix/configure.in
index eaf61d6..cfa1b1d 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.134.2.5 2007/09/19 17:28:25 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.134.2.6 2007/10/02 20:43:54 dgp Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.59)
@@ -27,9 +27,9 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b1"
+TK_PATCH_LEVEL=".0"
 VERSION=${TK_VERSION}
-LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru"
+LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
diff --git a/unix/tk.spec b/unix/tk.spec
index 732c3ad..83dbbbc 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,11 +1,11 @@
-# $Id: tk.spec,v 1.25.2.1 2007/05/22 20:34:53 dgp Exp $
+# $Id: tk.spec,v 1.25.2.2 2007/10/02 20:43:54 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.5b1
+Version:       8.5.0
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index 6990259..34608c1 100755
--- a/win/configure
+++ b/win/configure
@@ -1309,7 +1309,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b1"
+TK_PATCH_LEVEL=".0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 2ef76b6..a57f066 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.66.2.1 2007/05/22 20:34:53 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.66.2.2 2007/10/02 20:43:55 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.59)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b1"
+TK_PATCH_LEVEL=".0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
author	dgp <dgp@users.sourceforge.net>	2007-10-02 20:43:52 (GMT)
committer	dgp <dgp@users.sourceforge.net>	2007-10-02 20:43:52 (GMT)
commit	acce2990f96bc2da819f72e4a14584b80617d457 (patch)
tree	4693d55f344f29e16501f8171e4053ad09e4cb7a
parent	866c5d22436853398b078226064f655c6dd69eea (diff)
download	tk-acce2990f96bc2da819f72e4a14584b80617d457.zip tk-acce2990f96bc2da819f72e4a14584b80617d457.tar.gz tk-acce2990f96bc2da819f72e4a14584b80617d457.tar.bz2