diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-02 08:07:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-02 08:07:41 (GMT) |
| commit | 1c055ce56efa3c3f23a627238525b871d770ed6e (patch) | |
| tree | 06700e17082ffe0a6e793a54f4663aba2fded552 /generic/tkButton.c | |
| parent | 4702f656ba869c0cba56459ee489744e035fa9a6 (diff) | |
| parent | 288cea6827428e424632326901e73d2807cb2135 (diff) | |
| download | tk-1c055ce56efa3c3f23a627238525b871d770ed6e.zip tk-1c055ce56efa3c3f23a627238525b871d770ed6e.tar.gz tk-1c055ce56efa3c3f23a627238525b871d770ed6e.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index bf16489..e40f3b8 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -104,8 +104,13 @@ static const Tk_OptionSpec labelOptionSpecs[] = { NULL, 0, TCL_INDEX_NONE, 0, "-foreground", 0}, {TK_OPTION_FONT, "-font", "font", "Font", DEF_BUTTON_FONT, TCL_INDEX_NONE, offsetof(TkButton, tkfont), 0, 0, 0}, +#ifdef DEF_LABEL_FG + {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", + DEF_LABEL_FG, -1, Tk_Offset(TkButton, normalFg), 0, 0, 0}, +#else {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", DEF_BUTTON_FG, TCL_INDEX_NONE, offsetof(TkButton, normalFg), 0, 0, 0}, +#endif {TK_OPTION_STRING, "-height", "height", "Height", DEF_BUTTON_HEIGHT, offsetof(TkButton, heightPtr), TCL_INDEX_NONE, 0, 0, 0}, {TK_OPTION_BORDER, "-highlightbackground", "highlightBackground", |