From d28676b1bedf7d3ce6cd75eae391856fcc1a70d0 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Wed, 12 Nov 2008 22:43:25 +0000 Subject: backported listbox test fix from head - the default activestyle on windows is 'underline' --- ChangeLog | 2 ++ tests/constraints.tcl | 1 + tests/listbox.test | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91a1292..2d3a317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2008-11-12 Pat Thoyts + * tests/constraints.tcl: backported listbox test fix from head + * tests/listbox.test: the default on windows is 'underline' * tests/winDialog.test: backported some fixes from head * library/text.tcl: Backported fix for bug #1777362 to have events * test/text.test: work with window paths that include hyphens. diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 94f7931..843ee4d 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -146,6 +146,7 @@ namespace import -force tk::test::* namespace import -force tcltest::testConstraint testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}] testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}] +testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}] testConstraint userInteraction 0 testConstraint nonUnixUserInteraction [expr { [testConstraint userInteraction] || diff --git a/tests/listbox.test b/tests/listbox.test index 339c62d..d7b7da0 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: listbox.test,v 1.28.2.1 2008/10/09 21:20:45 dgp Exp $ +# RCS: @(#) $Id: listbox.test,v 1.28.2.2 2008/11/12 22:43:25 patthoyts Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -2131,11 +2131,16 @@ test listbox-28.1 {listbox -activestyle} { listbox .l -activ non .l cget -activestyle } none -test listbox-28.2 {listbox -activestyle} { +test listbox-28.2-nonwin {listbox -activestyle} {nonwin} { destroy .l listbox .l .l cget -activestyle } dotbox +test listbox-28.2-win {listbox -activestyle} {win} { + destroy .l + listbox .l + .l cget -activestyle +} underline test listbox-28.3 {listbox -activestyle} { destroy .l listbox .l -activestyle und -- cgit v0.12