diff options
| author | ericm <ericm> | 2000-05-25 16:57:23 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-05-25 16:57:23 (GMT) |
| commit | 1154932c72abbeb2e99ff4037f5fcfabe778a89b (patch) | |
| tree | b0f58532831951ab7b8a8bf2126ebea85f408697 /generic | |
| parent | e738a8c0b81557adfe941a8ea6765de709cb65a8 (diff) | |
| download | tk-1154932c72abbeb2e99ff4037f5fcfabe778a89b.zip tk-1154932c72abbeb2e99ff4037f5fcfabe778a89b.tar.gz tk-1154932c72abbeb2e99ff4037f5fcfabe778a89b.tar.bz2 | |
* doc/radiobutton.n: Added documentation for -overrelief option.
* doc/checkbutton.n: Added documentation for -overrelief option.
* doc/label.n: Added documentation for -state option.
* generic/tkButton.c: Added -overrelief option for checkbuttons,
and radiobuttons.
* library/button.tcl (tkButtonDown, macintosh version): Added
protection against querying the -repeatdelay option from a widget
that doesn't support it (ie, checkbuttons, radiobuttons, etc).
Other platforms use a different binding script for checkbuttons
and radiobuttons, so they don't have this issue.
(tkCheckRadioEnter, windows version): Added code to handle
-overrelief for check/radiobuttons on windows.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkButton.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 8f70e3d..b539552 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkButton.c,v 1.7 2000/05/17 21:17:20 ericm Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.8 2000/05/25 16:57:23 ericm Exp $ */ #include "tkButton.h" @@ -57,6 +57,12 @@ static char *compoundStrings[] = { */ static Tk_OptionSpec labelOptionSpecs[] = { + {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground", + DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder), + 0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0}, + {TK_OPTION_COLOR, "-activeforeground", "activeForeground", "Background", + DEF_BUTTON_ACTIVE_FG_COLOR, -1, Tk_Offset(TkButton, activeFg), + TK_OPTION_NULL_OK, (ClientData) DEF_BUTTON_ACTIVE_FG_MONO, 0}, {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", DEF_BUTTON_ANCHOR, -1, Tk_Offset(TkButton, anchor), 0, 0, 0}, {TK_OPTION_BORDER, "-background", "background", "Background", @@ -303,6 +309,9 @@ static Tk_OptionSpec checkbuttonOptionSpecs[] = { DEF_BUTTON_OFF_VALUE, Tk_Offset(TkButton, offValuePtr), -1, 0, 0, 0}, {TK_OPTION_STRING, "-onvalue", "onValue", "Value", DEF_BUTTON_ON_VALUE, Tk_Offset(TkButton, onValuePtr), -1, 0, 0, 0}, + {TK_OPTION_RELIEF, "-overrelief", "overRelief", "OverRelief", + DEF_BUTTON_OVER_RELIEF, -1, Tk_Offset(TkButton, overRelief), + TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", DEF_LABCHKRAD_PADX, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, @@ -404,6 +413,9 @@ static Tk_OptionSpec radiobuttonOptionSpecs[] = { 0, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", DEF_BUTTON_JUSTIFY, -1, Tk_Offset(TkButton, justify), 0, 0, 0}, + {TK_OPTION_RELIEF, "-overrelief", "overRelief", "OverRelief", + DEF_BUTTON_OVER_RELIEF, -1, Tk_Offset(TkButton, overRelief), + TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", DEF_LABCHKRAD_PADX, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, |