summaryrefslogtreecommitdiffstats
path: root/library/ttk/utils.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 /library/ttk/utils.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 'library/ttk/utils.tcl')
-rw-r--r--library/ttk/utils.tcl17
1 files changed, 11 insertions, 6 deletions
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 7cc1bb7..27f92c0 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -30,14 +30,14 @@ proc ttk::takefocus {w} {
proc ttk::GuessTakeFocus {w} {
# Don't traverse to widgets with '-state disabled':
#
- if {![catch {$w cget -state} state] && $state eq "disabled"} {
+ if {(![catch {$w cget -state} state]) && ($state eq "disabled")} {
return 0
}
# Allow traversal to widgets with explicit key or focus bindings:
#
- if {[regexp {Key|Focus} [concat [bind $w] [bind [winfo class $w]]]]} {
- return 1;
+ if {[regexp "Key|Focus" [concat [bind $w] [bind [winfo class $w]]]]} {
+ return 1
}
# Default is nontraversable:
@@ -144,10 +144,13 @@ proc ttk::SaveGrab {w} {
set grabbed [grab current $w]
if {[winfo exists $grabbed]} {
- switch [grab status $grabbed] {
+ switch -- [grab status $grabbed] {
global { set restoreGrab [list grab -global $grabbed] }
local { set restoreGrab [list grab $grabbed] }
- none { ;# grab window is really in a different interp }
+ none {
+ # grab window is really in a different interp
+ }
+ default {}
}
}
@@ -306,11 +309,12 @@ proc ttk::bindMouseWheel {bindtag callback} {
bind $bindtag <ButtonPress-5> "$callback +1"
}
win32 {
- bind $bindtag <MouseWheel> [append callback { [expr {-(%D/120)}]}]
+ bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
}
aqua {
bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
}
+ default {}
}
}
@@ -345,6 +349,7 @@ switch -- [tk windowingsystem] {
bind TtkScrollable <Shift-Option-MouseWheel> \
{ %W xview scroll [expr {-10*(%D)}] units }
}
+ default {}
}
#*EOF*