summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--generic/tkEntry.c6
-rw-r--r--tests/canvText.test12
3 files changed, 21 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index cd14df0..84fe34b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,19 @@
+2008-10-28 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/canvText.test: Backport test updates in light of the
+ 2008-10-05 commit.
+
+ * generic/tkEntry.c: Fix missing space constructing the scroll
+ command.
+
2008-10-05 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* win/tkWinScrlbr.c: Convert 'sprintf(..."%g"...)' to the
* macosx/tkMacOSXScrlbr.c: locale-insensitive Tcl_PrintDouble.
- * generic/tkScrollbar.c: [Bug 2112563]
- * generic/tkListbox.c:
- * generic/tkEntry.c:
- * generic/tkCanvText.c:
+ * generic/tkScrollbar.c: [Bug 2112563] NOTE: Tcl_PrintDouble
+ * generic/tkListbox.c: is sensitive to the value of
+ * generic/tkEntry.c: ::tcl_precision.
+ * generic/tkCanvText.c: *** POTENTIAL INCOMPATIBILITY ***
* generic/tkArgv.c:
2008-08-25 Todd M. Helfter <tmh@users.sourceforge.net>
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 3ba727f..3694375 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkEntry.c,v 1.47.2.1 2008/10/05 11:34:46 dkf Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.47.2.2 2008/10/09 15:17:44 dgp Exp $
*/
#include "tkInt.h"
@@ -2944,8 +2944,8 @@ EntryUpdateScrollbar(
EntryVisibleRange(entryPtr, &first, &last);
Tcl_PrintDouble(NULL, first, firstStr);
Tcl_PrintDouble(NULL, last, lastStr);
- code = Tcl_VarEval(interp, entryPtr->scrollCmd, firstStr, " ", lastStr,
- NULL);
+ code = Tcl_VarEval(interp, entryPtr->scrollCmd, " ", firstStr, " ",
+ lastStr, NULL);
if (code != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (horizontal scrolling command executed by ");
diff --git a/tests/canvText.test b/tests/canvText.test
index 1650f62..615bf15 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -6,7 +6,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: canvText.test,v 1.16 2006/01/12 13:38:22 dkf Exp $
+# RCS: @(#) $Id: canvText.test,v 1.16.4.1 2008/10/09 15:17:44 dgp Exp $
package require tcltest 2.1
eval tcltest::configure $argv
@@ -423,14 +423,14 @@ test canvText-11.2 {TextToArea procedure} {
test canvText-12.1 {ScaleText procedure} {
.c coords test 100 100
.c scale all 50 50 2 2
- .c coords test
-} {150.0 150.0}
+ format {%.6g %.6g} {*}[.c coords test]
+} {150 150}
test canvText-13.1 {TranslateText procedure} {
.c coords test 100 100
.c move all 10 10
- .c coords test
-} {110.0 110.0}
+ format {%.6g %.6g} {*}[.c coords test]
+} {110 110}
.c itemconfig test -text "abcdefghijklmno" -anchor nw
.c select from test 5
@@ -491,7 +491,7 @@ test canvText-17.1 {TextToPostscript procedure} {
\[(000)\]
\[(000)\]
\[(00)\]
-] $ay -0.5 0 0 false DrawText
+] $ay -0.5 0.0 0 false DrawText
grestore
restore showpage