summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-12-20 11:09:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-12-20 11:09:53 (GMT)
commitac0ac59425874c951ee09237bf6b71a35f732389 (patch)
tree4f1c2dfd2c6489570af70b35f37a6f7cd4134c27 /generic
parent3995dc62be9c998621195585e1eed2bad0152a17 (diff)
downloadtk-ac0ac59425874c951ee09237bf6b71a35f732389.zip
tk-ac0ac59425874c951ee09237bf6b71a35f732389.tar.gz
tk-ac0ac59425874c951ee09237bf6b71a35f732389.tar.bz2
Since TK_OPTION_ANCHOR doesn't support the TK_CONFIG_NULL_OK flag, don't set this flag here. Adapt testcases to use -relief instead, which _does_ support TK_CONFIG_NULL_OK
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTest.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 0ca5fea..13d8392 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -618,7 +618,7 @@ TestobjconfigObjCmd(
{TK_OPTION_BORDER, "-border", "border", "Border",
"blue", Tk_Offset(TypesRecord, borderPtr), -1,
TK_CONFIG_NULL_OK, "white", 0x100},
- {TK_OPTION_RELIEF, "-relief", "relief", "Relief", "raised",
+ {TK_OPTION_RELIEF, "-relief", "relief", "Relief", NULL,
Tk_Offset(TypesRecord, reliefPtr), -1,
TK_CONFIG_NULL_OK, 0, 0x200},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", "xterm",
@@ -627,9 +627,9 @@ TestobjconfigObjCmd(
{TK_OPTION_JUSTIFY, "-justify", NULL, NULL, "left",
Tk_Offset(TypesRecord, justifyPtr), -1,
0, 0, 0x800},
- {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", NULL,
+ {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", "center",
Tk_Offset(TypesRecord, anchorPtr), -1,
- TK_CONFIG_NULL_OK, 0, 0x1000},
+ 0, 0, 0x1000},
{TK_OPTION_PIXELS, "-pixel", "pixel", "Pixel",
"1", Tk_Offset(TypesRecord, pixelPtr), -1,
TK_CONFIG_NULL_OK, 0, 0x2000},
@@ -891,7 +891,7 @@ TestobjconfigObjCmd(
{TK_OPTION_BORDER, "-border", "border", "Border", "blue",
-1, Tk_Offset(InternalRecord, border),
TK_CONFIG_NULL_OK, "white", 0x100},
- {TK_OPTION_RELIEF, "-relief", "relief", "Relief", "raised",
+ {TK_OPTION_RELIEF, "-relief", "relief", "Relief", NULL,
-1, Tk_Offset(InternalRecord, relief),
TK_CONFIG_NULL_OK, 0, 0x200},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", "xterm",
@@ -900,9 +900,9 @@ TestobjconfigObjCmd(
{TK_OPTION_JUSTIFY, "-justify", NULL, NULL, "left",
-1, Tk_Offset(InternalRecord, justify),
0, 0, 0x800},
- {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", NULL,
+ {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", "center",
-1, Tk_Offset(InternalRecord, anchor),
- TK_CONFIG_NULL_OK, 0, 0x1000},
+ 0, 0, 0x1000},
{TK_OPTION_PIXELS, "-pixel", "pixel", "Pixel", "1",
-1, Tk_Offset(InternalRecord, pixels),
TK_CONFIG_NULL_OK, 0, 0x2000},