diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-18 12:52:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-18 12:52:51 (GMT) |
| commit | 4a6594a2645b35090c7bd0af6c4fe097345f44e8 (patch) | |
| tree | 64047c82294e288fa0fb21bc02ab5a5dc413e152 /generic/tkText.h | |
| parent | 51865b0ab9117baf2676e86b0e423ea570b7dd12 (diff) | |
| parent | 88aa509e1f20951b7f699b7be941555f9d76774a (diff) | |
| download | tk-4a6594a2645b35090c7bd0af6c4fe097345f44e8.zip tk-4a6594a2645b35090c7bd0af6c4fe097345f44e8.tar.gz tk-4a6594a2645b35090c7bd0af6c4fe097345f44e8.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tkText.h')
| -rw-r--r-- | generic/tkText.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/generic/tkText.h b/generic/tkText.h index 2227fd1..aba6b3b 100644 --- a/generic/tkText.h +++ b/generic/tkText.h @@ -358,9 +358,8 @@ typedef struct TkTextTag { * baseline of line. Used for superscripts and * subscripts. Only valid if offsetString is * non-NULL. */ -#if TCL_MAJOR_VERSION < 9 - char *overstrikeString; /* (not used any more) */ -#endif + Tcl_Obj *overstrikePtr; /* -overstrike option. NULL + * means option not specified. */ int overstrike; /* > 0 means draw horizontal line through * middle of text. -1 means not specified. */ XColor *overstrikeColor; /* Color for the overstrike. NULL means same @@ -397,9 +396,8 @@ typedef struct TkTextTag { * NULL. Corresponds to tabString. */ int tabStyle; /* One of TK_TEXT_TABSTYLE_TABULAR or TK_TEXT_TABSTYLE_WORDPROCESSOR * or TK_TEXT_TABSTYLE_NULL (if not specified). */ -#if TCL_MAJOR_VERSION < 9 - char *underlineString; /* (not used any more) */ -#endif + Tcl_Obj *underlinePtr; /* -underline option. NULL + * means option not specified. */ int underline; /* > 0 means draw underline underneath * text. -1 means not specified. */ XColor *underlineColor; /* Color for the underline. NULL means same @@ -409,9 +407,8 @@ typedef struct TkTextTag { * TEXT_WRAPMODE_NONE, TEXT_WRAPMODE_WORD, or * TEXT_WRAPMODE_NULL to use wrapmode for * whole widget. */ -#if TCL_MAJOR_VERSION < 9 - char *elideString; /* (not used any more) */ -#endif + Tcl_Obj *elidePtr; /* -elide option. NULL + * means option not specified. */ int elide; /* > 0 means that data under this tag * should not be displayed. -1 means not specified. */ int affectsDisplay; /* Non-zero means that this tag affects the |