diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-06-11 15:12:04 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-06-11 15:12:04 (GMT) |
| commit | 5cf0f795fc1d9eb0dd751bd05faa534f0b83d1ca (patch) | |
| tree | 3ace914c78147ef3795ca37f19900e38ddc2b7b4 /generic/tkText.c | |
| parent | d60b9e28ecea5421fcb384737837748d9cd677df (diff) | |
| parent | 9f82192c9761bc6a1870592b3ff3bd48e1be361d (diff) | |
| download | tk-5cf0f795fc1d9eb0dd751bd05faa534f0b83d1ca.zip tk-5cf0f795fc1d9eb0dd751bd05faa534f0b83d1ca.tar.gz tk-5cf0f795fc1d9eb0dd751bd05faa534f0b83d1ca.tar.bz2 | |
Merged core-8-6-branch
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 60e726f..e028a54 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -122,7 +122,8 @@ static const Tk_ObjCustomOption lineOption = { static const Tk_OptionSpec optionSpecs[] = { {TK_OPTION_BOOLEAN, "-autoseparators", "autoSeparators", "AutoSeparators", DEF_TEXT_AUTO_SEPARATORS, -1, - Tk_Offset(TkText, autoSeparators), 0, 0, 0}, + Tk_Offset(TkText, autoSeparators), + TK_OPTION_DONT_SET_DEFAULT, 0, 0}, {TK_OPTION_BORDER, "-background", "background", "Background", DEF_TEXT_BG_COLOR, -1, Tk_Offset(TkText, border), 0, DEF_TEXT_BG_MONO, 0}, @@ -193,7 +194,8 @@ static const Tk_OptionSpec optionSpecs[] = { DEF_TEXT_INSERT_WIDTH, -1, Tk_Offset(TkText, insertWidth), 0, 0, 0}, {TK_OPTION_INT, "-maxundo", "maxUndo", "MaxUndo", - DEF_TEXT_MAX_UNDO, -1, Tk_Offset(TkText, maxUndo), 0, 0, 0}, + DEF_TEXT_MAX_UNDO, -1, Tk_Offset(TkText, maxUndo), + TK_OPTION_DONT_SET_DEFAULT, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", DEF_TEXT_PADX, -1, Tk_Offset(TkText, padX), 0, 0, TK_TEXT_LINE_GEOMETRY}, @@ -239,7 +241,8 @@ static const Tk_OptionSpec optionSpecs[] = { DEF_TEXT_TAKE_FOCUS, -1, Tk_Offset(TkText, takeFocus), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-undo", "undo", "Undo", - DEF_TEXT_UNDO, -1, Tk_Offset(TkText, undo), 0, 0 , 0}, + DEF_TEXT_UNDO, -1, Tk_Offset(TkText, undo), + TK_OPTION_DONT_SET_DEFAULT, 0 , 0}, {TK_OPTION_INT, "-width", "width", "Width", DEF_TEXT_WIDTH, -1, Tk_Offset(TkText, width), 0, 0, TK_TEXT_LINE_GEOMETRY}, |