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, 2 insertions, 8 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index c9444f3..7e74942 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, - DEF_CANVLINE_FILL, Tk_Offset(LineItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVITEM_OUTLINE, 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 648647c..84b2a23 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, - DEF_CANVTEXT_FILL, Tk_Offset(TextItem, color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVITEM_OUTLINE, 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 6463ea2..4e73ac9 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -549,7 +549,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -559,7 +558,6 @@ #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 f2c119b..3e9ef97 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -511,7 +511,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL BLACK #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -521,7 +520,6 @@ #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 be41bb6..852de02 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -515,7 +515,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -525,7 +524,6 @@ #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 |