summaryrefslogtreecommitdiffstats
path: root/tests/canvPsBmap.tcl
diff options
context:
space:
mode:
authorandreask <andreask>2013-01-22 19:30:43 (GMT)
committerandreask <andreask>2013-01-22 19:30:43 (GMT)
commit48c9fcb7281cc6aa076113db874c7ae0e105795d (patch)
tree7187940ff056462bfa41705a2ce04d0ed07d424e /tests/canvPsBmap.tcl
parent41f5d19540b0b3f053da352e1569c9a4ed019dd5 (diff)
downloadtk-contrib_patrick_fradin_code_cleanup.zip
tk-contrib_patrick_fradin_code_cleanup.tar.gz
tk-contrib_patrick_fradin_code_cleanup.tar.bz2
Contribution by Patrick Fradin <patrick.fradin@planar.com>contrib_patrick_fradin_code_cleanup
Quoting his mail: <pre> ========================================================== Hi Jeff, I spent some of my time to contribute to the TclTk community ! I'm in late for Christmas gift but like we said in French : "Mieux vaut tard que jamais". ;-) I've use TclDevKit 5.3.0 tclchecker to analyse TclTk code in Tcl and Tk library directories (library, tools and tests) to correct a lot of warnings and few errors. (encapsulate some expr, use 'chan xxx' instead of fconfigure, fileevent...) I've made some improvements too : Examples : - Use 'lassign' instead of many 'lindex' of 'foreach/break' loop. - Use 'in' or 'ni' operators instead of 'lsearch -exact' or to factorise some eq/ne && / || tests. - Use 'eq' or 'ne' to tests strings instead of '==' or '!='. - Use 'unset -nocomplain' to avoid 'catch {unset...}'. - Remove some useless catch around 'destroy' calls. - Use expand {*} instead of 'eval'. Don't touch a lot of code because I don't know all structs and lists. I think it could be a greater improvement to reduce 'eval' calls. Due to previous experience, I dot not change any indentation ! ;-) ========================================================== </pre>
Diffstat (limited to 'tests/canvPsBmap.tcl')
-rw-r--r--tests/canvPsBmap.tcl22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/canvPsBmap.tcl b/tests/canvPsBmap.tcl
index 4a7a7e2..dd7cc0e 100644
--- a/tests/canvPsBmap.tcl
+++ b/tests/canvPsBmap.tcl
@@ -2,7 +2,7 @@
# for bitmaps in canvases. It is part of the Tk visual test suite,
# which is invoked via the "visual" script.
-catch {destroy .t}
+destroy .t
toplevel .t
wm title .t "Postscript Tests for Canvases"
wm iconname .t "Postscript"
@@ -20,7 +20,7 @@ button .t.bot.quit -text Quit -command {destroy .t}
button .t.bot.print -text Print -command "lpr $c"
pack .t.bot.print .t.bot.quit -side left -pady 1m -expand 1
-canvas $c -width 6i -height 6i -bd 2 -relief sunken
+canvas $c -width 6i -height 6i -borderwidth 2 -relief sunken
pack $c -expand yes -fill both -padx 2m -pady 2m
set canvPsBmapImageDir [file join [file dirname [info script]] images]
@@ -28,47 +28,47 @@ set canvPsBmapImageDir [file join [file dirname [info script]] images]
$c create bitmap 0.5i 0.5i \
-bitmap @[file join $canvPsBmapImageDir flagdown.xbm] \
-background {} -foreground black -anchor nw
-$c create rect 0.47i 0.47i 0.53i 0.53i -fill {} -outline black
+$c create rect 0.47i 0.47i 0.53i 0.53i -fill "" -outline black
$c create bitmap 3.0i 0.5i \
-bitmap @[file join $canvPsBmapImageDir flagdown.xbm] \
-background {} -foreground black -anchor n
-$c create rect 2.97i 0.47i 3.03i 0.53i -fill {} -outline black
+$c create rect 2.97i 0.47i 3.03i 0.53i -fill "" -outline black
$c create bitmap 5.5i 0.5i \
-bitmap @[file join $canvPsBmapImageDir flagdown.xbm] \
-background black -foreground white -anchor ne
-$c create rect 5.47i 0.47i 5.53i 0.53i -fill {} -outline black
+$c create rect 5.47i 0.47i 5.53i 0.53i -fill "" -outline black
$c create bitmap 0.5i 3.0i \
-bitmap @[file join $canvPsBmapImageDir face.xbm] \
-background {} -foreground black -anchor w
-$c create rect 0.47i 2.97i 0.53i 3.03i -fill {} -outline black
+$c create rect 0.47i 2.97i 0.53i 3.03i -fill "" -outline black
$c create bitmap 3.0i 3.0i \
-bitmap @[file join $canvPsBmapImageDir face.xbm] \
-background {} -foreground black -anchor center
-$c create rect 2.97i 2.97i 3.03i 3.03i -fill {} -outline black
+$c create rect 2.97i 2.97i 3.03i 3.03i -fill "" -outline black
$c create bitmap 5.5i 3.0i \
-bitmap @[file join $canvPsBmapImageDir face.xbm] \
-background blue -foreground black -anchor e
-$c create rect 5.47i 2.97i 5.53i 3.03i -fill {} -outline black
+$c create rect 5.47i 2.97i 5.53i 3.03i -fill "" -outline black
$c create bitmap 0.5i 5.5i \
-bitmap @[file join $canvPsBmapImageDir flagup.xbm] \
-background black -foreground white -anchor sw
-$c create rect 0.47i 5.47i 0.53i 5.53i -fill {} -outline black
+$c create rect 0.47i 5.47i 0.53i 5.53i -fill "" -outline black
$c create bitmap 3.0i 5.5i \
-bitmap @[file join $canvPsBmapImageDir flagup.xbm] \
-background green -foreground white -anchor s
-$c create rect 2.97i 5.47i 3.03i 5.53i -fill {} -outline black
+$c create rect 2.97i 5.47i 3.03i 5.53i -fill "" -outline black
$c create bitmap 5.5i 5.5i \
-bitmap @[file join $canvPsBmapImageDir flagup.xbm] \
-background {} -foreground black -anchor se
-$c create rect 5.47i 5.47i 5.53i 5.53i -fill {} -outline black
+$c create rect 5.47i 5.47i 5.53i 5.53i -fill "" -outline black