diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-11-02 18:08:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-11-02 18:08:51 (GMT) |
| commit | f1e2ff7d1e64f611921e1fe537875f8939f50134 (patch) | |
| tree | 3d50292e2e3d27680bbd2509c4b3e28ce064267a /generic | |
| parent | 2c7448ee7a61cc6f89bfffb8410af6662c9ce6ce (diff) | |
| parent | 19e72587e7d675d197daecdb202e28b64e428992 (diff) | |
| download | tk-f1e2ff7d1e64f611921e1fe537875f8939f50134.zip tk-f1e2ff7d1e64f611921e1fe537875f8939f50134.tar.gz tk-f1e2ff7d1e64f611921e1fe537875f8939f50134.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkButton.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index 72e9815..1be7ee6 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -81,8 +81,8 @@ static Tk_OptionSpec BaseOptionSpecs[] = * Compound base/image options */ {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", - "none", Tk_Offset(Base,base.compoundObj), -1, - TK_OPTION_DONT_SET_DEFAULT,(ClientData)ttkCompoundStrings, + NULL, Tk_Offset(Base,base.compoundObj), -1, + TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings, GEOMETRY_CHANGED }, {TK_OPTION_STRING, "-padding", "padding", "Pad", NULL, Tk_Offset(Base,base.paddingObj), -1, diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 56439a6..39ed6aa 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -69,8 +69,8 @@ static Tk_OptionSpec TabOptionSpecs[] = {TK_OPTION_STRING, "-image", "image", "Image", NULL/*default*/, Tk_Offset(Tab,imageObj), -1, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED }, {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", - "none", Tk_Offset(Tab,compoundObj), -1, - 0,(ClientData)ttkCompoundStrings,GEOMETRY_CHANGED }, + NULL, Tk_Offset(Tab,compoundObj), -1, + TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,GEOMETRY_CHANGED }, {TK_OPTION_INT, "-underline", "underline", "Underline", "-1", Tk_Offset(Tab,underlineObj), -1, 0,0,GEOMETRY_CHANGED }, {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 } |