diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
| commit | 0d5336db012f45753abace489f18f0ca299c6961 (patch) | |
| tree | b1bf3280a9046df99226158978502eeb26f5b0a3 /generic/ttk/ttkButton.c | |
| parent | e97381a6d921de403516d5b761539a450f4af83c (diff) | |
| parent | 1320b8a2a9c1269a345d44d673a7a35707fbbe9c (diff) | |
| download | tk-core-tip-626.zip tk-core-tip-626.tar.gz tk-core-tip-626.tar.bz2 | |
Merge 9.0core-tip-626
Diffstat (limited to 'generic/ttk/ttkButton.c')
| -rw-r--r-- | generic/ttk/ttkButton.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index af72ea4..dbf4d7e 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -404,7 +404,7 @@ TTK_BEGIN_LAYOUT(ButtonLayout) TTK_GROUP("Button.border", TTK_FILL_BOTH|TTK_BORDER, TTK_GROUP("Button.focus", TTK_FILL_BOTH, TTK_GROUP("Button.padding", TTK_FILL_BOTH, - TTK_NODE("Button.label", TTK_FILL_BOTH)))) + TTK_NODE("Button.label", TTK_FILL_BOTH)))) TTK_END_LAYOUT /*------------------------------------------------------------------------ @@ -505,11 +505,11 @@ CheckbuttonConfigure(Tcl_Interp *interp, void *recordPtr, int mask) Ttk_TraceHandle *vt = NULL; if (varName != NULL && *Tcl_GetString(varName) != '\0') { - vt = Ttk_TraceVariable(interp, varName, + vt = Ttk_TraceVariable(interp, varName, CheckbuttonVariableChanged, checkPtr); - if (!vt) { + if (!vt) { return TCL_ERROR; - } + } } if (BaseConfigure(interp, recordPtr, mask) != TCL_OK){ @@ -518,7 +518,7 @@ CheckbuttonConfigure(Tcl_Interp *interp, void *recordPtr, int mask) } if (checkPtr->checkbutton.variableTrace) { - Ttk_UntraceVariable(checkPtr->checkbutton.variableTrace); + Ttk_UntraceVariable(checkPtr->checkbutton.variableTrace); } checkPtr->checkbutton.variableTrace = vt; @@ -566,11 +566,11 @@ CheckbuttonInvokeCommand( newValue = checkPtr->checkbutton.onValueObj; if (checkPtr->checkbutton.variableObj == NULL || - *Tcl_GetString(checkPtr->checkbutton.variableObj) == '\0') - CheckbuttonVariableChanged(checkPtr, Tcl_GetString(newValue)); + *Tcl_GetString(checkPtr->checkbutton.variableObj) == '\0') + CheckbuttonVariableChanged(checkPtr, Tcl_GetString(newValue)); else if (Tcl_ObjSetVar2(interp, - checkPtr->checkbutton.variableObj, NULL, newValue, - TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG) + checkPtr->checkbutton.variableObj, NULL, newValue, + TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG) == NULL) return TCL_ERROR; @@ -859,7 +859,7 @@ TTK_BEGIN_LAYOUT(MenubuttonLayout) TTK_GROUP("Menubutton.focus", TTK_FILL_BOTH, TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT) TTK_GROUP("Menubutton.padding", TTK_FILL_X, - TTK_NODE("Menubutton.label", TTK_PACK_LEFT)))) + TTK_NODE("Menubutton.label", TTK_PACK_LEFT)))) TTK_END_LAYOUT /*------------------------------------------------------------------------ |