diff options
author | das <das> | 2006-04-22 04:12:25 (GMT) |
---|---|---|
committer | das <das> | 2006-04-22 04:12:25 (GMT) |
commit | 1899aa0c63592f33a10e92fcdb0679ac99e84576 (patch) | |
tree | 12982ca17e3d41a2c531e36d8990a41c9a2b47fa /tests | |
parent | 9c58f434c68e50e58327b833da67a6fd23c839f6 (diff) | |
download | tk-1899aa0c63592f33a10e92fcdb0679ac99e84576.zip tk-1899aa0c63592f33a10e92fcdb0679ac99e84576.tar.gz tk-1899aa0c63592f33a10e92fcdb0679ac99e84576.tar.bz2 |
* macosx/tkMacOSXEmbed.c:
* macosx/tkMacOSXWm.c:
* tests/constraints.tcl:
* tests/wm.test: sync with 2006-04-18 commit to HEAD. (darley)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/constraints.tcl | 1 | ||||
-rw-r--r-- | tests/wm.test | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 7898250..f131ff8 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -128,6 +128,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 userInteraction 0 testConstraint nonUnixUserInteraction [expr {[testConstraint userInteraction] || [testConstraint unix]}] diff --git a/tests/wm.test b/tests/wm.test index e34d58d..4202720 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: wm.test,v 1.21.2.6 2005/12/01 18:31:43 dgp Exp $ +# RCS: @(#) $Id: wm.test,v 1.21.2.7 2006/04/22 04:12:25 das Exp $ # This file tests window manager interactions that work across # platforms. Window manager tests that only work on a specific @@ -142,10 +142,13 @@ test wm-attributes-1.2.3 {usage} {pcOnly} { list [catch {wm attributes . -to} err] $err } {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-disabled ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}} -test wm-attributes-1.2.4 {usage} {macOrUnix} { +test wm-attributes-1.2.4 {usage} {macOrUnix notAqua} { list [catch {wm attributes . _} err] $err } {1 {wrong # args: should be "wm attributes window"}} +test wm-attributes-1.2.5 {usage} {aqua} { + list [catch {wm attributes . _} err] $err +} {1 {bad attribute "_": must be -alpha, -modified, or -titlepath}} test wm-client-1.1 {usage} { list [catch {wm client} err] $err |