summaryrefslogtreecommitdiffstats
path: root/library/ttk/notebook.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/notebook.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/notebook.tcl')
-rw-r--r--library/ttk/notebook.tcl17
1 files changed, 10 insertions, 7 deletions
diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl
index 72b85e6..6d2c88e 100644
--- a/library/ttk/notebook.tcl
+++ b/library/ttk/notebook.tcl
@@ -32,7 +32,10 @@ proc ttk::notebook::ActivateTab {w tab} {
set newtab [$w select] ;# NOTE: might not be $tab, if $tab is disabled
if {[focus] eq $w} { return }
- if {$newtab eq $oldtab} { focus $w ; return }
+ if {$newtab eq $oldtab} {
+ focus $w
+ return
+ }
update idletasks ;# needed so focus logic sees correct mapped states
if {[set f [ttk::focusFirst $newtab]] ne ""} {
@@ -60,7 +63,7 @@ proc ttk::notebook::CycleTab {w dir} {
if {[$w index end] != 0} {
set current [$w index current]
set select [expr {($current + $dir) % [$w index end]}]
- while {[$w tab $select -state] != "normal" && ($select != $current)} {
+ while {([$w tab $select -state] ne "normal") && ($select != $current)} {
set select [expr {($select + $dir) % [$w index end]}]
}
if {$select != $current} {
@@ -74,13 +77,13 @@ proc ttk::notebook::CycleTab {w dir} {
# specified mnemonic. If found, returns path name of tab;
# otherwise returns ""
#
-proc ttk::notebook::MnemonicTab {nb key} {
- set key [string toupper $key]
+proc ttk::notebook::MnemonicTab {nb a_key} {
+ set key [string toupper $a_key]
foreach tab [$nb tabs] {
set label [$nb tab $tab -text]
set underline [$nb tab $tab -underline]
set mnemonic [string toupper [string index $label $underline]]
- if {$mnemonic ne "" && $mnemonic eq $key} {
+ if {($mnemonic ne "") && ($mnemonic eq $key)} {
return $tab
}
}
@@ -160,8 +163,8 @@ proc ttk::notebook::EnclosingNotebook {w} {
set top [winfo toplevel $w]
if {![info exists TLNotebooks($top)]} { return }
- while {$w ne $top && $w ne ""} {
- if {[lsearch -exact $TLNotebooks($top) $w] >= 0} {
+ while {$w ni "$top {}"} {
+ if {$w in $TLNotebooks($top)} {
return $w
}
set w [winfo parent $w]