diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-03-11 13:42:57 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-03-11 13:42:57 (GMT) |
| commit | 7b9b6bc458d9a187d5e32d2b05ab1fdaabee45ee (patch) | |
| tree | e6fe00cea6126593b64b0959a1511d2942d07b74 /generic | |
| parent | d72c843661bf5789ff40389b8b71707d92437397 (diff) | |
| download | tk-7b9b6bc458d9a187d5e32d2b05ab1fdaabee45ee.zip tk-7b9b6bc458d9a187d5e32d2b05ab1fdaabee45ee.tar.gz tk-7b9b6bc458d9a187d5e32d2b05ab1fdaabee45ee.tar.bz2 | |
Fix [85cea56c27]: The -underline option does not show an underline on ttk::label, ttk::labelframe, ttk::notebook tabs.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkButton.c | 10 | ||||
| -rw-r--r-- | generic/ttk/ttkFrame.c | 8 | ||||
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 7 |
3 files changed, 21 insertions, 4 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index 856f867..bf4e651 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -66,8 +66,14 @@ static const Tk_OptionSpec BaseOptionSpecs[] = offsetof(Base,base.textVariableObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED }, {TK_OPTION_INDEX, "-underline", "underline", "Underline", - TK_OPTION_UNDERLINE_DEF(Base, base.underline), 0}, - /* SB: OPTION_INT, see <<NOTE-NULLOPTIONS>> */ +#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) + "-1", offsetof(Base,base.underline), TCL_INDEX_NONE, + 0,0,0 }, +#else + NULL, offsetof(Base,base.underline), TCL_INDEX_NONE, + TK_OPTION_NULL_OK,0,0 }, +#endif + /* SB: OPTION_INT, see <<NOTE-NULLOPTIONS>> */ {TK_OPTION_STRING, "-width", "width", "Width", NULL, offsetof(Base,base.widthObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED }, diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index adb8ba9..e38ed1e 100644 --- a/generic/ttk/ttkFrame.c +++ b/generic/ttk/ttkFrame.c @@ -259,7 +259,13 @@ static const Tk_OptionSpec LabelframeOptionSpecs[] = { offsetof(Labelframe,label.textObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED }, {TK_OPTION_INDEX, "-underline", "underline", "Underline", - TK_OPTION_UNDERLINE_DEF(Labelframe, label.underline), 0}, +#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) + "-1", offsetof(Labelframe,label.underline), TCL_INDEX_NONE, + 0,0,0 }, +#else + NULL, offsetof(Labelframe,label.underline), TCL_INDEX_NONE, + TK_OPTION_NULL_OK,0,0 }, +#endif {TK_OPTION_WINDOW, "-labelwidget", "labelWidget", "LabelWidget", NULL, TCL_INDEX_NONE, offsetof(Labelframe,label.labelWidget), TK_OPTION_NULL_OK,0,LABELWIDGET_CHANGED|GEOMETRY_CHANGED }, diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 5a0445a..9584e7b 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -68,7 +68,12 @@ static const Tk_OptionSpec TabOptionSpecs[] = NULL, offsetof(Tab,compoundObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK,ttkCompoundStrings,GEOMETRY_CHANGED }, {TK_OPTION_INDEX, "-underline", "underline", "Underline", - TK_OPTION_UNDERLINE_DEF(Tab, underline), GEOMETRY_CHANGED}, +#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) + "-1", offsetof(Tab,underline), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED }, +#else + NULL, offsetof(Tab,underline), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED }, +#endif + {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 } }; |