diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-01-11 10:31:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-01-11 10:31:29 (GMT) |
| commit | 980a5866d09747314f497cbb936a6b54e46ad882 (patch) | |
| tree | 44e864e0e6f74f9789f865b88f537159aedf89ce /generic | |
| parent | 525a44578154b1daf5989ec0bc69b836dfb6c544 (diff) | |
| parent | cc784b877bf7b144c0fc36ca7c9f5c18622e75d6 (diff) | |
| download | tk-980a5866d09747314f497cbb936a6b54e46ad882.zip tk-980a5866d09747314f497cbb936a6b54e46ad882.tar.gz tk-980a5866d09747314f497cbb936a6b54e46ad882.tar.bz2 | |
Merge trunk.
ttkButton.c: Invalid use of TK_OPTION_DONT_SET_DEFAULT, should have been TK_OPTION_NULL_OK as in normal button.
tkTextTag.c: Use of TK_OPTION_DONT_SET_DEFAULT means that the default value "0" is ignored, so better use NULL.
FossilOrigin-Name: 9d6cd6aec059c00da7898e70f9543c12cfde9d28
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkTextTag.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkButton.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index af3f235..a433905 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -44,10 +44,10 @@ static const Tk_OptionSpec tagOptionSpecs[] = { {TK_OPTION_BITMAP, "-bgstipple", NULL, NULL, NULL, -1, Tk_Offset(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-borderwidth", NULL, NULL, - "0", Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth), + NULL, Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth), TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_STRING, "-elide", NULL, NULL, - "0", -1, Tk_Offset(TkTextTag, elideString), + NULL, -1, Tk_Offset(TkTextTag, elideString), TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BITMAP, "-fgstipple", NULL, NULL, NULL, -1, Tk_Offset(TkTextTag, fgStipple), TK_OPTION_NULL_OK, 0, 0}, diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index 2954184..bc44f25 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -413,8 +413,8 @@ typedef struct static Tk_OptionSpec CheckbuttonOptionSpecs[] = { {TK_OPTION_STRING, "-variable", "variable", "Variable", - "", Tk_Offset(Checkbutton, checkbutton.variableObj), -1, - TK_OPTION_DONT_SET_DEFAULT,0,0}, + NULL, Tk_Offset(Checkbutton, checkbutton.variableObj), -1, + TK_OPTION_NULL_OK,0,0}, {TK_OPTION_STRING, "-onvalue", "onValue", "OnValue", "1", Tk_Offset(Checkbutton, checkbutton.onValueObj), -1, 0,0,0}, |