diff options
author | andreask <andreask> | 2013-01-22 19:30:43 (GMT) |
---|---|---|
committer | andreask <andreask> | 2013-01-22 19:30:43 (GMT) |
commit | 48c9fcb7281cc6aa076113db874c7ae0e105795d (patch) | |
tree | 7187940ff056462bfa41705a2ce04d0ed07d424e /library/ttk/ttk.tcl | |
parent | 41f5d19540b0b3f053da352e1569c9a4ed019dd5 (diff) | |
download | tk-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/ttk.tcl')
-rw-r--r-- | library/ttk/ttk.tcl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/library/ttk/ttk.tcl b/library/ttk/ttk.tcl index 7bae211..1df95cf 100644 --- a/library/ttk/ttk.tcl +++ b/library/ttk/ttk.tcl @@ -21,7 +21,7 @@ source [file join $::ttk::library utils.tcl] # $old and $new must be fully namespace-qualified. # proc ttk::deprecated {old new} { - interp alias {} $old {} ttk::do'deprecate $old $new + interp alias "" $old "" ttk::do'deprecate $old $new } ## do'deprecate -- # Implementation procedure for deprecated commands -- @@ -29,7 +29,7 @@ proc ttk::deprecated {old new} { # proc ttk::do'deprecate {old new args} { deprecated'warning $old $new - interp alias {} $old {} $new + interp alias "" $old "" $new uplevel 1 [linsert $args 0 $new] } @@ -133,7 +133,7 @@ proc ttk::LoadThemes {} { xpnative {xpTheme.tcl vistaTheme.tcl} aqua aquaTheme.tcl } { - if {[lsearch -exact $builtinThemes $theme] >= 0} { + if {$theme in $builtinThemes} { foreach script $scripts { uplevel #0 [list source [file join $library $script]] } @@ -141,7 +141,8 @@ proc ttk::LoadThemes {} { } } -ttk::LoadThemes; rename ::ttk::LoadThemes {} +ttk::LoadThemes +rename ::ttk::LoadThemes "" ### Select platform-specific default theme: # @@ -157,9 +158,9 @@ proc ttk::DefaultTheme {} { set preferred [list aqua vista xpnative winnative] set userTheme [option get . tkTheme TkTheme] - if {$userTheme ne {} && ![catch { + if {($userTheme ne "") && (![catch { uplevel #0 [list package require ttk::theme::$userTheme] - }]} { + }])} { return $userTheme } @@ -171,6 +172,7 @@ proc ttk::DefaultTheme {} { return "default" } -ttk::setTheme [ttk::DefaultTheme] ; rename ttk::DefaultTheme {} +ttk::setTheme [ttk::DefaultTheme] +rename ttk::DefaultTheme "" #*EOF* |