diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-14 15:52:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-14 15:52:14 (GMT) |
| commit | e3f3b6381aa5b6bdfbf9b13f0788d5a2164d7b74 (patch) | |
| tree | e1bfe47ff7244514f43714ba258c9f39c6a8651d /generic/tkText.h | |
| parent | f9747c69e2da6a3ba02d3ce2f2c81710243bec1c (diff) | |
| download | tk-e3f3b6381aa5b6bdfbf9b13f0788d5a2164d7b74.zip tk-e3f3b6381aa5b6bdfbf9b13f0788d5a2164d7b74.tar.gz tk-e3f3b6381aa5b6bdfbf9b13f0788d5a2164d7b74.tar.bz2 | |
Proposed fix for [026e2bb685]: text tag sets bad relief, gets error, but bad relief is saved anyway
Diffstat (limited to 'generic/tkText.h')
| -rw-r--r-- | generic/tkText.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tkText.h b/generic/tkText.h index c821305..e2972f1 100644 --- a/generic/tkText.h +++ b/generic/tkText.h @@ -322,8 +322,9 @@ typedef struct TkTextTag { * value specified here. */ int borderWidth; /* Width of 3-D border for background. */ Tcl_Obj *borderWidthPtr; /* Width of 3-D border for background. */ - char *reliefString; /* -relief option string (malloc-ed). NULL - * means option not specified. */ +#if TK_MAJOR_VERSION < 9 + char *reliefString; /* Not used any more */ +#endif int relief; /* 3-D relief for background. */ Pixmap bgStipple; /* Stipple bitmap for background. None means * no value specified here. */ @@ -334,11 +335,11 @@ typedef struct TkTextTag { Pixmap fgStipple; /* Stipple bitmap for text and other * foreground stuff. None means no value * specified here.*/ - char *justifyString; /* -justify option string (malloc-ed). NULL - * means option not specified. */ +#if TK_MAJOR_VERSION < 9 + char *justifyString; /* Not used any more */ +#endif Tk_Justify justify; /* How to justify text: TK_JUSTIFY_LEFT, - * TK_JUSTIFY_RIGHT, TK_JUSTIFY_CENTER, or TK_JUSTIFY_NULL. - * Only valid if justifyString is non-NULL. */ + * TK_JUSTIFY_RIGHT, TK_JUSTIFY_CENTER, or TK_JUSTIFY_NULL. */ char *lMargin1String; /* -lmargin1 option string (malloc-ed). NULL * means option not specified. */ int lMargin1; /* Left margin for first display line of each |