* 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, 35 insertions, 11 deletions

diff --git a/doc/checkbutton.n b/doc/checkbutton.n
index 9e83699..ff8d74a 100644
--- a/doc/checkbutton.n
+++ b/doc/checkbutton.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: checkbutton.n,v 1.6 2002/08/28 01:08:06 drh Exp $
+'\" RCS: @(#) $Id: checkbutton.n,v 1.7 2004/02/18 00:40:23 hobbs Exp $
 '\" 
 .so man.macros
 .TH checkbutton n 4.4 Tk "Tk Built-In Commands"
@@ -95,6 +95,14 @@ should be insensitive:  the default bindings will refuse to activate
 the widget and will ignore mouse button presses.
 In this state the \fBdisabledForeground\fR and
 \fBbackground\fR options determine how the checkbutton is displayed.
+.OP \-tristateimage tristateImage TristateImage
+Specifies an image to display (in place of the \fBimage\fR option)
+when the checkbutton is in tri-state mode.
+This option is ignored unless the \fBimage\fR option has been
+specified.
+.OP \-tristatevalue tristateValue Value
+Specifies the value that causes the checkbutton to display the multi-value 
+selection, also known as the tri-state mode.  Defaults to ``""''
 .OP \-variable variable Variable
 Specifies name of global variable to set to indicate whether
 or not this button is selected.  Defaults to the name of the
@@ -145,18 +153,23 @@ If a checkbutton is selected then the indicator is normally
 drawn with a selected appearance, and
 a Tcl variable associated with the checkbutton is set to a particular
 value (normally 1).
-Under Unix, the indicator is drawn with a sunken relief and a special
-color.  Under Windows, the indicator is drawn with a check mark inside.
+The indicator is drawn with a check mark inside.
 If the checkbutton is not selected, then the indicator is drawn with a
 deselected appearance, and the associated variable is
 set to a different value (typically 0).
-Under Unix, the indicator is drawn with a raised relief and no special
-color.  Under Windows, the indicator is drawn without a check mark inside.
+The indicator is drawn without a check mark inside.  In the special case 
+where the variable (if specified) has a value that matches the tristatevalue, 
+the indicator is drawn with a tri-state appearance and is in the tri-state 
+mode indicating mixed or multiple values.  (This is used when the check 
+box represents the state of multiple items.)
+The indicator is drawn in a platform dependent manner.  Under Unix and 
+Windows, the background interior of the box is ``grayed''.  Under Mac, 
+the indicator is drawn with a dash mark inside.
 .VE
 By default, the name of the variable associated with a checkbutton is the
 same as the \fIname\fR used to create the checkbutton.
-The variable name, and the ``on'' and ``off'' values stored in it,
-may be modified with options on the command line or in the option
+The variable name, and the ``on'', ``off'' and ``tristate'' values stored in 
+it, may be modified with options on the command line or in the option
 database.
 Configuration options may also be used to modify the way the
 indicator is displayed (or whether it is displayed at all).
@@ -164,7 +177,7 @@ By default a checkbutton is configured to select and deselect
 itself on alternate button clicks.
 In addition, each checkbutton monitors its associated variable and
 automatically selects and deselects itself when the variables value
-changes to and from the button's ``on'' value.
+changes to and from the button's ``on'', ``off'' and ``tristate'' values.
 
 .SH "WIDGET COMMAND"
 .PP
diff --git a/doc/radiobutton.n b/doc/radiobutton.n
index 2cc08e2..239d07a 100644
--- a/doc/radiobutton.n
+++ b/doc/radiobutton.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: radiobutton.n,v 1.6 2002/08/28 01:08:06 drh Exp $
+'\" RCS: @(#) $Id: radiobutton.n,v 1.7 2004/02/18 00:40:24 hobbs Exp $
 '\" 
 .so man.macros
 .TH radiobutton n 4.4 Tk "Tk Built-In Commands"
@@ -90,6 +90,14 @@ should be insensitive:  the default bindings will refuse to activate
 the widget and will ignore mouse button presses.
 In this state the \fBdisabledForeground\fR and
 \fBbackground\fR options determine how the radiobutton is displayed.
+.OP \-tristateimage tristateImage TristateImage
+Specifies an image to display (in place of the \fBimage\fR option)
+when the radiobutton is selected.
+This option is ignored unless the \fBimage\fR option has been
+specified.
+.OP \-tristatevalue tristateValue Value
+Specifies the value that causes the radiobutton to display the multi-value 
+selection, also known as the tri-state mode.  Defaults to ``""''
 .OP \-value value Value
 Specifies value to store in the button's associated variable whenever
 this button is selected.
@@ -147,8 +155,7 @@ color.  Under Windows, the indicator is drawn with a round mark inside.
 If the radiobutton is not selected, then the indicator is drawn with a
 deselected appearance, and the associated variable is
 set to a different value (typically 0).
-Under Unix, the indicator is drawn with a raised relief and no special
-color.  Under Windows, the indicator is drawn without a round mark inside.
+The indicator is drawn without a round mark inside.
 .VE
 Typically, several radiobuttons share a single variable and the
 value of the variable indicates which radiobutton is to be selected.
@@ -156,6 +163,10 @@ When a radiobutton is selected it sets the value of the variable to
 indicate that fact;  each radiobutton also monitors the value of
 the variable and automatically selects and deselects itself when the
 variable's value changes.
+If the variable's value matches the tristatevalue, then the radiobutton is 
+drawn using the tri-state mode.  This mode is used to indicate mixed or 
+multiple values.  (This is used when the radio button represents the state 
+of multiple items.)
 By default the variable \fBselectedButton\fR
 is used;  its contents give the name of the button that is
 selected, or the empty string if no button associated with that