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>

1 files changed, 11 insertions, 10 deletions

diff --git a/library/dialog.tcl b/library/dialog.tcl
index 6a9babb..a064c45 100644
--- a/library/dialog.tcl
+++ b/library/dialog.tcl
@@ -27,21 +27,22 @@
 # args -	One or more strings to display in buttons across the
 #		bottom of the dialog box.
 
-proc ::tk_dialog {w title text bitmap default args} {
+proc ::tk_dialog {w title text bitmap a_default args} {
     global tcl_platform
     variable ::tk::Priv
 
     # Check that $default was properly given
-    if {[string is integer -strict $default]} {
-	if {$default >= [llength $args]} {
+    if {[string is integer -strict $a_default]} {
+	if {$a_default >= [llength $args]} {
 	    return -code error -errorcode {TK DIALOG BAD_DEFAULT} \
 		"default button index greater than number of buttons\
 		specified for tk_dialog"
 	}
-    } elseif {"" eq $default} {
+        set default $a_default
+    } elseif {"" eq $a_default} {
 	set default -1
     } else {
-	set default [lsearch -exact $args $default]
+	set default [lsearch -exact $args $a_default]
     }
 
     set windowingsystem [tk windowingsystem]
@@ -72,7 +73,7 @@ proc ::tk_dialog {w title text bitmap default args} {
     }
 
     if {$windowingsystem eq "aqua"} {
-	::tk::unsupported::MacWindowStyle style $w moveableModal {}
+	::tk::unsupported::MacWindowStyle style $w moveableModal ""
     } elseif {$windowingsystem eq "x11"} {
 	wm attributes $w -type dialog
     }
@@ -80,8 +81,8 @@ proc ::tk_dialog {w title text bitmap default args} {
     frame $w.bot
     frame $w.top
     if {$windowingsystem eq "x11"} {
-	$w.bot configure -relief raised -bd 1
-	$w.top configure -relief raised -bd 1
+	$w.bot configure -relief raised -borderwidth 1
+	$w.top configure -relief raised -borderwidth 1
     }
     pack $w.bot -side bottom -fill both
     pack $w.top -side top -fill both -expand 1
@@ -97,7 +98,7 @@ proc ::tk_dialog {w title text bitmap default args} {
     label $w.msg -justify left -text $text
     pack $w.msg -in $w.top -side right -expand 1 -fill both -padx 3m -pady 3m
     if {$bitmap ne ""} {
-	if {$windowingsystem eq "aqua" && $bitmap eq "error"} {
+	if {($windowingsystem eq "aqua") && ($bitmap eq "error")} {
 	    set bitmap "stop"
 	}
 	label $w.bitmap -bitmap $bitmap
@@ -120,7 +121,7 @@ proc ::tk_dialog {w title text bitmap default args} {
 	# We boost the size of some Mac buttons for l&f
 	if {$windowingsystem eq "aqua"} {
 	    set tmp [string tolower $but]
-	    if {$tmp eq "ok" || $tmp eq "cancel"} {
+	    if {$tmp in "ok cancel"} {
 		grid columnconfigure $w.bot $i -minsize 90
 	    }
 	    grid configure $w.button$i -pady 7