diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-03-20 08:28:05 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-03-20 08:28:05 (GMT) |
| commit | a6147a73cc09ce18e35f8dce240c9bbdb8462512 (patch) | |
| tree | 3866d51bb2a0e08acdbf78404a5920173f166363 /generic/tkText.h | |
| parent | f7a453a1ae131c17d52732ae042f69a7ce87f214 (diff) | |
| download | tk-a6147a73cc09ce18e35f8dce240c9bbdb8462512.zip tk-a6147a73cc09ce18e35f8dce240c9bbdb8462512.tar.gz tk-a6147a73cc09ce18e35f8dce240c9bbdb8462512.tar.bz2 | |
Merged tip-443 following acceptation of the TIP by TCT vote (cherrypicked [cb3354b298])
Diffstat (limited to 'generic/tkText.h')
| -rw-r--r-- | generic/tkText.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/generic/tkText.h b/generic/tkText.h index fc92644..5d88784 100644 --- a/generic/tkText.h +++ b/generic/tkText.h @@ -347,6 +347,9 @@ typedef struct TkTextTag { int lMargin2; /* Left margin for second and later display * lines of each text line, in pixels. Only * valid if lMargin2String is non-NULL. */ + Tk_3DBorder lMarginColor; /* Used for drawing background in left margins. + * This is used for both lmargin1 and lmargin2. + * NULL means no value specified here. */ char *offsetString; /* -offset option string (malloc-ed). NULL * means option not specified. */ int offset; /* Vertical offset of text's baseline from @@ -358,10 +361,18 @@ typedef struct TkTextTag { int overstrike; /* Non-zero means draw horizontal line through * middle of text. Only valid if * overstrikeString is non-NULL. */ + XColor *overstrikeColor; /* Color for the overstrike. NULL means same + * color as foreground. */ char *rMarginString; /* -rmargin option string (malloc-ed). NULL * means option not specified. */ int rMargin; /* Right margin for text, in pixels. Only * valid if rMarginString is non-NULL. */ + Tk_3DBorder rMarginColor; /* Used for drawing background in right margin. + * NULL means no value specified here. */ + Tk_3DBorder selBorder; /* Used for drawing background for selected text. + * NULL means no value specified here. */ + XColor *selFgColor; /* Foreground color for selected text. NULL means + * no value specified here. */ char *spacing1String; /* -spacing1 option string (malloc-ed). NULL * means option not specified. */ int spacing1; /* Extra spacing above first display line for @@ -389,6 +400,8 @@ typedef struct TkTextTag { int underline; /* Non-zero means draw underline underneath * text. Only valid if underlineString is * non-NULL. */ + XColor *underlineColor; /* Color for the underline. NULL means same + * color as foreground. */ TkWrapMode wrapMode; /* How to handle wrap-around for this tag. * Must be TEXT_WRAPMODE_CHAR, * TEXT_WRAPMODE_NONE, TEXT_WRAPMODE_WORD, or |