From 1accd097c0b26b731ca673d7c0c7a3a42e7d0839 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Fri, 11 May 2007 12:10:17 +0000 Subject: Avoid font dependencies in the results --- ChangeLog | 2 ++ tests/winButton.test | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6ac2e5..cbb5b59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-05-11 Pat Thoyts + * tests/winButton.test: Avoid font dependencies in results. + * generic/tkFont.c: bug #1716613 propagate error from TkDeleteNamedFont. diff --git a/tests/winButton.test b/tests/winButton.test index 8914023..1ffcc2f 100644 --- a/tests/winButton.test +++ b/tests/winButton.test @@ -8,7 +8,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winButton.test,v 1.11 2004/06/24 12:45:44 dkf Exp $ +# RCS: @(#) $Id: winButton.test,v 1.12 2007/05/11 12:10:19 patthoyts Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -37,8 +37,8 @@ test winbutton-1.1 {TkpComputeButtonGeometry procedure} {testImageType win} { image1 changed 0 0 0 0 60 40 label .b1 -image image1 -bd 4 -padx 0 -pady 2 button .b2 -image image1 -bd 4 -padx 0 -pady 2 - checkbutton .b3 -image image1 -bd 4 -padx 1 -pady 1 - radiobutton .b4 -image image1 -bd 4 -padx 2 -pady 0 + checkbutton .b3 -image image1 -bd 4 -padx 1 -pady 1 -font {{MS Sans Serif} 8} + radiobutton .b4 -image image1 -bd 4 -padx 2 -pady 0 -font {{MS Sans Serif} 8} pack .b1 .b2 .b3 .b4 update # with patch 463234 with native L&F enabled, this returns: @@ -52,8 +52,8 @@ test winbutton-1.2 {TkpComputeButtonGeometry procedure} win { deleteWindows label .b1 -bitmap question -bd 3 -padx 0 -pady 2 button .b2 -bitmap question -bd 3 -padx 0 -pady 2 - checkbutton .b3 -bitmap question -bd 3 -padx 1 -pady 1 - radiobutton .b4 -bitmap question -bd 3 -padx 2 -pady 0 + checkbutton .b3 -bitmap question -bd 3 -padx 1 -pady 1 -font {{MS Sans Serif} 8} + radiobutton .b4 -bitmap question -bd 3 -padx 2 -pady 0 -font {{MS Sans Serif} 8} pack .b1 .b2 .b3 .b4 update # with patch 463234 with native L&F enabled, this returns: -- cgit v0.12