diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-05-15 20:37:30 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-05-15 20:37:30 (GMT) |
| commit | b3416a1f71841b1e019141f5001da4f77dfc82fd (patch) | |
| tree | d1f769080f7f2f7371ead86fd924beab1c03bf7d /generic/tkText.c | |
| parent | e7a9d5b4216c95a123e5b0d9275fd5f60e9be6d4 (diff) | |
| parent | bda0a45a208de3d182d90ff66dbfd432a9cf771f (diff) | |
| download | tk-b3416a1f71841b1e019141f5001da4f77dfc82fd.zip tk-b3416a1f71841b1e019141f5001da4f77dfc82fd.tar.gz tk-b3416a1f71841b1e019141f5001da4f77dfc82fd.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 0a4a652..ea6c5fc 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -43,16 +43,6 @@ #define PIXEL_CLIENTS 5 /* - * The 'TkTextState' enum in tkText.h is used to define a type for the -state - * option of the Text widget. These values are used as indices into the string - * table below. - */ - -static const char *const stateStrings[] = { - "disabled", "normal", NULL -}; - -/* * The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap * option of the Text widget. These values are used as indices into the string * table below. @@ -189,7 +179,7 @@ static const Tk_OptionSpec optionSpecs[] = { {TK_OPTION_STRING_TABLE, "-insertunfocussed", "insertUnfocussed", "InsertUnfocussed", DEF_TEXT_INSERT_UNFOCUSSED, -1, Tk_Offset(TkText, insertUnfocussed), - 0, insertUnfocussedStrings, 0}, + TK_OPTION_ENUM_VAR, insertUnfocussedStrings, 0}, {TK_OPTION_PIXELS, "-insertwidth", "insertWidth", "InsertWidth", DEF_TEXT_INSERT_WIDTH, -1, Tk_Offset(TkText, insertWidth), 0, 0, 0}, @@ -230,7 +220,7 @@ static const Tk_OptionSpec optionSpecs[] = { &lineOption, TK_TEXT_LINE_RANGE}, {TK_OPTION_STRING_TABLE, "-state", "state", "State", DEF_TEXT_STATE, -1, Tk_Offset(TkText, state), - 0, stateStrings, 0}, + 0, &tkStateStrings[1], 0}, {TK_OPTION_STRING, "-tabs", "tabs", "Tabs", DEF_TEXT_TABS, Tk_Offset(TkText, tabOptionPtr), -1, TK_OPTION_NULL_OK, 0, TK_TEXT_LINE_GEOMETRY}, @@ -248,7 +238,7 @@ static const Tk_OptionSpec optionSpecs[] = { TK_TEXT_LINE_GEOMETRY}, {TK_OPTION_STRING_TABLE, "-wrap", "wrap", "Wrap", DEF_TEXT_WRAP, -1, Tk_Offset(TkText, wrapMode), - 0, wrapStrings, TK_TEXT_LINE_GEOMETRY}, + TK_OPTION_ENUM_VAR, wrapStrings, TK_TEXT_LINE_GEOMETRY}, {TK_OPTION_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand", DEF_TEXT_XSCROLL_COMMAND, -1, Tk_Offset(TkText, xScrollCmd), TK_OPTION_NULL_OK, 0, 0}, |