diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-04-19 17:29:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-04-19 17:29:39 (GMT) |
| commit | 460dcd4bf3f9fadbd240dfcf2831278cb264e3bf (patch) | |
| tree | b00f7f86b33280c023fbe908510435241ef9f314 /generic/ttk | |
| parent | 7e7435a12f36a5146680ece7bff1f4f48f407944 (diff) | |
| parent | bcb71c3efaadfc55dcd742522aaf331a40b9a7ec (diff) | |
| download | tk-little.zip tk-little.tar.gz tk-little.tar.bz2 | |
Merge 8.6.5 release.little
Diffstat (limited to 'generic/ttk')
| -rw-r--r-- | generic/ttk/ttkButton.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 2 |
2 files changed, 3 insertions, 3 deletions
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}, diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 16a8bfe..81a8b64 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -901,7 +901,7 @@ static int NotebookAddCommand( if (tab->state == TAB_STATE_HIDDEN) { tab->state = TAB_STATE_NORMAL; } - if (ConfigureTab(interp, nb, tab, slaveWindow, objc-4,objv+4) != TCL_OK) { + if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) { return TCL_ERROR; } |