diff options
author | Kevin Walzer <kw@codebykevin.com> | 2019-09-29 01:35:11 (GMT) |
---|---|---|
committer | Kevin Walzer <kw@codebykevin.com> | 2019-09-29 01:35:11 (GMT) |
commit | 986dfecd5ca69082f4cacdad5d3765cb2ec4751b (patch) | |
tree | 78de5f489d9cde4cc8ad430081d35acc3e57853c /generic | |
parent | 498193093bc985ea1e5a088a808e90b9addc7fc3 (diff) | |
parent | 5fbc1190fdaf5ac2493686973878c1221bf37505 (diff) | |
download | tk-986dfecd5ca69082f4cacdad5d3765cb2ec4751b.zip tk-986dfecd5ca69082f4cacdad5d3765cb2ec4751b.tar.gz tk-986dfecd5ca69082f4cacdad5d3765cb2ec4751b.tar.bz2 |
Merge core-8-6-branch
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkCanvArc.c | 3 | ||||
-rw-r--r-- | generic/tkCanvBmap.c | 3 | ||||
-rw-r--r-- | generic/tkCanvLine.c | 3 | ||||
-rw-r--r-- | generic/tkCanvPoly.c | 5 | ||||
-rw-r--r-- | generic/tkCanvText.c | 2 | ||||
-rw-r--r-- | generic/tkRectOval.c | 3 |
6 files changed, 12 insertions, 7 deletions
diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c index d9f0461..c93b95a 100644 --- a/generic/tkCanvArc.c +++ b/generic/tkCanvArc.c @@ -12,6 +12,7 @@ #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" /* * The structure below defines the record for each arc item. @@ -144,7 +145,7 @@ static const Tk_ConfigSpec configSpecs[] = { "0,0", Tk_Offset(ArcItem, tsoffset), TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, {TK_CONFIG_COLOR, "-outline", NULL, NULL, - "black", Tk_Offset(ArcItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVITEM_OUTLINE, Tk_Offset(ArcItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-outlineoffset", NULL, NULL, "0,0", Tk_Offset(ArcItem, outline.tsoffset), TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index b9de07b..01d875c 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -12,6 +12,7 @@ #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" /* * The structure below defines the record for each bitmap item. @@ -70,7 +71,7 @@ static const Tk_ConfigSpec configSpecs[] = { NULL, Tk_Offset(BitmapItem, disabledFgColor), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-foreground", NULL, NULL, - "black", Tk_Offset(BitmapItem, fgColor), 0, NULL}, + DEF_CANVBMAP_FG, Tk_Offset(BitmapItem, fgColor), 0, NULL}, {TK_CONFIG_CUSTOM, "-state", NULL, NULL, NULL, Tk_Offset(Tk_Item, state), TK_CONFIG_NULL_OK, &stateOption}, diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index b6c845d..c9444f3 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -13,6 +13,7 @@ #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" /* * The structure below defines the record for each line item. @@ -175,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, - "black", 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/tkCanvPoly.c b/generic/tkCanvPoly.c index 6a8f865..03b3e57 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -13,6 +13,7 @@ #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" /* * The structure below defines the record for each polygon item. @@ -113,14 +114,14 @@ static const Tk_ConfigSpec configSpecs[] = { "0.0", Tk_Offset(PolygonItem, outline.disabledWidth), TK_CONFIG_DONT_SET_DEFAULT, &pixelOption}, {TK_CONFIG_COLOR, "-fill", NULL, NULL, - "black", Tk_Offset(PolygonItem, fillColor), TK_CONFIG_NULL_OK, NULL}, + NULL, Tk_Offset(PolygonItem, fillColor), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_JOIN_STYLE, "-joinstyle", NULL, NULL, "round", Tk_Offset(PolygonItem, joinStyle), TK_CONFIG_DONT_SET_DEFAULT, NULL}, {TK_CONFIG_CUSTOM, "-offset", NULL, NULL, "0,0", Tk_Offset(PolygonItem, tsoffset), TK_CONFIG_NULL_OK, &offsetOption}, {TK_CONFIG_COLOR, "-outline", NULL, NULL, - NULL, Tk_Offset(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVITEM_OUTLINE, Tk_Offset(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-outlineoffset", NULL, NULL, "0,0", Tk_Offset(PolygonItem, outline.tsoffset), TK_CONFIG_NULL_OK, &offsetOption}, diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 279e548..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, - "black", 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/generic/tkRectOval.c b/generic/tkRectOval.c index 359d3ef..87114c1 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -12,6 +12,7 @@ #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" /* * The structure below defines the record for each rectangle/oval item. @@ -102,7 +103,7 @@ static const Tk_ConfigSpec configSpecs[] = { "0,0", Tk_Offset(RectOvalItem, tsoffset), TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, {TK_CONFIG_COLOR, "-outline", NULL, NULL, - "black", Tk_Offset(RectOvalItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + DEF_CANVITEM_OUTLINE, Tk_Offset(RectOvalItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-outlineoffset", NULL, NULL, "0,0", Tk_Offset(RectOvalItem, outline.tsoffset), TK_CONFIG_DONT_SET_DEFAULT, &offsetOption}, |