* doc/checkbutton.n: TIP#110 implementation

	* doc/radiobutton.n: Tristate Checkbutton and Radiobuttons
	* generic/tkButton.c:
	* generic/tkButton.h:
	* library/demos/check.tcl:
	* library/demos/radio.tcl:
	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXDefault.h:
	* tests/button.test:
	* unix/tkUnixButton.c:
	* unix/tkUnixDefault.h:
	* win/tkWinButton.c:
	* win/tkWinDefault.h:

2 files changed, 59 insertions, 11 deletions

diff --git a/library/demos/check.tcl b/library/demos/check.tcl
index 82c5d18..ef8c5c3 100644
--- a/library/demos/check.tcl
+++ b/library/demos/check.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a toplevel window containing
 # several checkbuttons.
 #
-# RCS: @(#) $Id: check.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: check.tcl,v 1.4 2004/02/18 00:40:24 hobbs Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -16,14 +16,53 @@ wm title $w "Checkbutton Demonstration"
 wm iconname $w "check"
 positionWindow $w
 
-label $w.msg -font $font -wraplength 4i -justify left -text "Three checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  Click the \"See Variables\" button to see the current values of the variables."
+label $w.msg -font $font -wraplength 4i -justify left -text "Four checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  The first button also follows the state of the other three.  If only some of the three are checked, the first button will display the tri-state mode. Click the \"See Variables\" button to see the current values of the variables."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w [list wipers brakes sober]]
+set btns [addSeeDismiss $w.buttons $w [list safety wipers brakes sober]]
 pack $btns -side bottom -fill x
 
+checkbutton $w.b0 -text "Safety Check" -variable safety -relief flat \
+    -onvalue "all" \
+    -offvalue "none" \
+    -tristatevalue "partial"
 checkbutton $w.b1 -text "Wipers OK" -variable wipers -relief flat
 checkbutton $w.b2 -text "Brakes OK" -variable brakes -relief flat
 checkbutton $w.b3 -text "Driver Sober" -variable sober -relief flat
-pack $w.b1 $w.b2 $w.b3 -side top -pady 2 -anchor w
+pack $w.b0 -side top -pady 2 -anchor w
+pack $w.b1 $w.b2 $w.b3 -side top -pady 2 -anchor w -padx 15
+
+set in_check 0
+proc tristate_check {n1 n2 op} {
+    global safety wipers brakes sober in_check
+    if {$in_check} {
+	return
+    }
+    set in_check 1
+    if {$n1 eq "safety"} {
+	if {$safety eq "none"} {
+	    set wipers 0
+	    set brakes 0
+	    set sober 0
+	} elseif {$safety eq "all"} {
+	    set wipers 1
+	    set brakes 1
+	    set sober 1
+	}
+    } else {
+	if {$wipers == 1 && $brakes == 1 && $sober == 1} {
+	    set safety all
+	} elseif {$wipers == 1 || $brakes == 1 || $sober == 1} {
+	    set safety partial
+	} else {
+	    set safety none
+	}
+    }
+    set in_check 0
+}
+
+trace variable wipers w tristate_check
+trace variable brakes w tristate_check
+trace variable sober  w tristate_check
+trace variable safety w tristate_check
diff --git a/library/demos/radio.tcl b/library/demos/radio.tcl
index a636cb8..f637865 100644
--- a/library/demos/radio.tcl
+++ b/library/demos/radio.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a toplevel window containing
 # several radiobutton widgets.
 #
-# RCS: @(#) $Id: radio.tcl,v 1.5 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: radio.tcl,v 1.6 2004/02/18 00:40:24 hobbs Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -15,21 +15,27 @@ toplevel $w
 wm title $w "Radiobutton Demonstration"
 wm iconname $w "radio"
 positionWindow $w
-label $w.msg -font $font -wraplength 5i -justify left -text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-pack $w.msg -side top
+label $w.msg -font $font -wraplength 5i -justify left -text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  When the 'Tristate' button is pressed, the radio buttons will display the tri-state mode. Selecting any radio button will return the buttons to their respective on/off state. Click the \"See Variables\" button to see the current values of the variables."
+grid $w.msg -row 0 -column 0 -columnspan 3 -sticky nsew
 
 ## See Code / Dismiss buttons
 set btns [addSeeDismiss $w.buttons $w [list size color align]]
-pack $btns -side bottom -fill x
+grid $btns -row 3 -column 0 -columnspan 3 -sticky ew
 
 labelframe $w.left -pady 2 -text "Point Size" -padx 2
 labelframe $w.mid -pady 2 -text "Color" -padx 2
 labelframe $w.right -pady 2 -text "Alignment" -padx 2
-pack $w.left $w.mid $w.right -side left -expand yes  -pady .5c -padx .5c
+button $w.tristate -text Tristate -command "set size multi; set color multi" \
+    -pady 2 -padx 2
+
+grid $w.left     -column 0 -row 1 -pady .5c -padx .5c -rowspan 2
+grid $w.mid      -column 1 -row 1 -pady .5c -padx .5c -rowspan 2
+grid $w.right    -column 2 -row 1 -pady .5c -padx .5c
+grid $w.tristate -column 2 -row 2 -pady .5c -padx .5c
 
 foreach i {10 12 14 18 24} {
     radiobutton $w.left.b$i -text "Point Size $i" -variable size \
-	    -relief flat -value $i
+	    -relief flat -value $i -tristatevalue "multi"
     pack $w.left.b$i  -side top -pady 2 -anchor w -fill x
 }
 
@@ -37,10 +43,12 @@ foreach c {Red Green Blue Yellow Orange Purple} {
     set lower [string tolower $c]
     radiobutton $w.mid.$lower -text $c -variable color \
 	    -relief flat -value $lower -anchor w \
-	    -command "$w.mid configure -fg \$color"
+	    -command "$w.mid configure -fg \$color" \
+	-tristatevalue "multi"
     pack $w.mid.$lower -side top -pady 2 -fill x
 }
 
+
 label $w.right.l -text "Label" -bitmap questhead -compound left
 $w.right.l configure -width [winfo reqwidth $w.right.l] -compound top
 $w.right.l configure -height [winfo reqheight $w.right.l]
@@ -50,6 +58,7 @@ foreach a {Top Left Right Bottom} {
 	    -relief flat -value $lower -indicatoron 0 -width 7 \
 	    -command "$w.right.l configure -compound \$align"
 }
+
 grid x $w.right.top
 grid $w.right.left $w.right.l $w.right.right
 grid x $w.right.bottom