diff options
| author | pspjuth <peter.spjuth@gmail.com> | 2012-08-26 17:07:19 (GMT) |
|---|---|---|
| committer | pspjuth <peter.spjuth@gmail.com> | 2012-08-26 17:07:19 (GMT) |
| commit | 2c2a2e6522dcfc11aaa8017b47bc14485313349b (patch) | |
| tree | d0cf2a1e6e56525333957dd5fe2aab36bf174a4c /generic/tkTextTag.c | |
| parent | fc0e57edc8cb5ad99ea9540032237367f8b0a777 (diff) | |
| parent | e4c7ef5bdf6375e1860418b1ec92c07f88660cc8 (diff) | |
| download | tk-pspjuth_canvas.zip tk-pspjuth_canvas.tar.gz tk-pspjuth_canvas.tar.bz2 | |
merge trunkpspjuth_canvas
Diffstat (limited to 'generic/tkTextTag.c')
| -rw-r--r-- | generic/tkTextTag.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index cf3b0c6..6cd018a 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -10,8 +10,6 @@ * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tkTextTag.c,v 1.34 2010/01/18 20:43:38 nijtmans Exp $ */ #include "default.h" @@ -82,13 +80,13 @@ static const Tk_OptionSpec tagOptionSpecs[] = { NULL, Tk_Offset(TkTextTag, tabStringPtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_STRING_TABLE, "-tabstyle", NULL, NULL, NULL, -1, Tk_Offset(TkTextTag, tabStyle), - TK_OPTION_NULL_OK, (ClientData) tabStyleStrings, 0}, + TK_OPTION_NULL_OK, tabStyleStrings, 0}, {TK_OPTION_STRING, "-underline", NULL, NULL, NULL, -1, Tk_Offset(TkTextTag, underlineString), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_STRING_TABLE, "-wrap", NULL, NULL, NULL, -1, Tk_Offset(TkTextTag, wrapMode), - TK_OPTION_NULL_OK, (ClientData) wrapStrings, 0}, + TK_OPTION_NULL_OK, wrapStrings, 0}, {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0} }; @@ -459,6 +457,11 @@ TkTextTagCmd( &tagPtr->elide) != TCL_OK) { return TCL_ERROR; } + /* Indices are potentially obsolete after changing -elide, + * especially those computed with "display" or "any" + * submodifier, therefore increase the epoch. + */ + textPtr->sharedTextPtr->stateEpoch++; } /* |