diff options
| author | dgp <dgp@noemail.net> | 2016-07-21 20:06:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2016-07-21 20:06:34 (GMT) |
| commit | 6e21967c0573ca7a2744d318dc3ee0222875e273 (patch) | |
| tree | cd7aaee28e7876e8bfdd77e835c534b13cbe5f98 /generic/tkText.h | |
| parent | 5ad0f56fe1463cf9fb13dee7ee3319665e7d8fd6 (diff) | |
| parent | 6ddcf9ad5374d63e332d9cf75792b0eb445efd5e (diff) | |
| download | tk-6e21967c0573ca7a2744d318dc3ee0222875e273.zip tk-6e21967c0573ca7a2744d318dc3ee0222875e273.tar.gz tk-6e21967c0573ca7a2744d318dc3ee0222875e273.tar.bz2 | |
merge 8.6
FossilOrigin-Name: 0cb77e7f99a32d51ab693f35524f4e7138da07b4
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 |