diff options
| -rw-r--r-- | generic/tkCanvLine.c | 2 | ||||
| -rw-r--r-- | generic/tkCanvText.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 2 | ||||
| -rw-r--r-- | unix/tkUnixDefault.h | 2 | ||||
| -rw-r--r-- | win/tkWinDefault.h | 2 |
5 files changed, 8 insertions, 2 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index 06ba3b1..c9444f3 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -176,7 +176,7 @@ static const Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_CAP_STYLE, "-capstyle", NULL, NULL, "butt", Tk_Offset(LineItem, capStyle), TK_CONFIG_DONT_SET_DEFAULT, NULL}, {TK_CONFIG_COLOR, "-fill", NULL, NULL, - NULL, Tk_Offset(LineItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVLINE_FILL, Tk_Offset(LineItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-dash", NULL, NULL, NULL, Tk_Offset(LineItem, outline.dash), TK_CONFIG_NULL_OK, &dashOption}, diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 92c520c..648647c 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -107,7 +107,7 @@ static const Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_BITMAP, "-disabledstipple", NULL, NULL, NULL, Tk_Offset(TextItem, disabledStipple), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-fill", NULL, NULL, - NULL, Tk_Offset(TextItem, color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVTEXT_FILL, Tk_Offset(TextItem, color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_FONT, "-font", NULL, NULL, DEF_CANVTEXT_FONT, Tk_Offset(TextItem, tkfont), 0, NULL}, {TK_CONFIG_JUSTIFY, "-justify", NULL, NULL, diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index 4e73ac9..6463ea2 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -549,6 +549,7 @@ * Defaults for canvas text: */ +#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -558,6 +559,7 @@ #define DEF_CANVBMAP_FG NORMAL_FG #define DEF_CANVITEM_OUTLINE NORMAL_FG +#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h index 3e9ef97..f2c119b 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -511,6 +511,7 @@ * Defaults for canvas text: */ +#define DEF_CANVTEXT_FILL BLACK #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -520,6 +521,7 @@ #define DEF_CANVBMAP_FG BLACK #define DEF_CANVITEM_OUTLINE BLACK +#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index 852de02..be41bb6 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -515,6 +515,7 @@ * Defaults for canvas text: */ +#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -524,6 +525,7 @@ #define DEF_CANVBMAP_FG NORMAL_FG #define DEF_CANVITEM_OUTLINE NORMAL_FG +#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply |