diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-02 08:09:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-02 08:09:26 (GMT) |
| commit | 6bb1893a62e90e6a22454a68afad0091cb8d03dd (patch) | |
| tree | 0e658ee775fc738df92534005a0ded6cea1dd008 /generic | |
| parent | 738449c09ee12142222516064368f368ac61d059 (diff) | |
| parent | 1c055ce56efa3c3f23a627238525b871d770ed6e (diff) | |
| download | tk-6bb1893a62e90e6a22454a68afad0091cb8d03dd.zip tk-6bb1893a62e90e6a22454a68afad0091cb8d03dd.tar.gz tk-6bb1893a62e90e6a22454a68afad0091cb8d03dd.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -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", |