diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-10 14:02:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-10 14:02:36 (GMT) |
| commit | 7186877f46e619506da6c59f98ccaa4c623a4fbe (patch) | |
| tree | 01e5d04969a82f12392a545d9eb1ac810e11a774 /generic/tkText.c | |
| parent | 2522c0935ba3317f2f6a19894ec0ae5fff3fcc95 (diff) | |
| parent | 2987950f24f7b2fda46de8d528a3693ccf7943b9 (diff) | |
| download | tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.zip tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.tar.gz tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.tar.bz2 | |
Rebase to 8.6, getting rid of DEF_TEXT_SPACING[123]
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 4edf652..eb9658e 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -211,18 +211,18 @@ static const Tk_OptionSpec optionSpecs[] = { TK_OPTION_NULL_OK, DEF_TEXT_SELECT_BD_MONO, 0}, {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background", DEF_TEXT_SELECT_FG_COLOR, -1, Tk_Offset(TkText, selFgColorPtr), - TK_CONFIG_NULL_OK, DEF_TEXT_SELECT_FG_MONO, 0}, + TK_OPTION_NULL_OK, DEF_TEXT_SELECT_FG_MONO, 0}, {TK_OPTION_BOOLEAN, "-setgrid", "setGrid", "SetGrid", DEF_TEXT_SET_GRID, -1, Tk_Offset(TkText, setGrid), 0, 0, 0}, {TK_OPTION_PIXELS, "-spacing1", "spacing1", "Spacing", - DEF_TEXT_SPACING1, -1, Tk_Offset(TkText, spacing1), - TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY }, + NULL, -1, Tk_Offset(TkText, spacing1), + TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY }, {TK_OPTION_PIXELS, "-spacing2", "spacing2", "Spacing", - DEF_TEXT_SPACING2, -1, Tk_Offset(TkText, spacing2), - TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY }, + NULL, -1, Tk_Offset(TkText, spacing2), + TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY }, {TK_OPTION_PIXELS, "-spacing3", "spacing3", "Spacing", - DEF_TEXT_SPACING3, -1, Tk_Offset(TkText, spacing3), - TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY }, + NULL, -1, Tk_Offset(TkText, spacing3), + TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY }, {TK_OPTION_CUSTOM, "-startline", NULL, NULL, NULL, -1, Tk_Offset(TkText, start), TK_OPTION_NULL_OK, &lineOption, TK_TEXT_LINE_RANGE}, |