diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-14 08:30:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-14 08:30:49 (GMT) |
| commit | 499d2cfd016df0e17cfd7b96fe70d61a7964a644 (patch) | |
| tree | 7cad7402662fce0760e1c14940052e16e052b84d /generic | |
| parent | f8e123a7ce6504a4682cc507edae2eb8b696621f (diff) | |
| parent | 9e7ea957b3c08bb06ba7a98956bfc39fca90f3cb (diff) | |
| download | tk-499d2cfd016df0e17cfd7b96fe70d61a7964a644.zip tk-499d2cfd016df0e17cfd7b96fe70d61a7964a644.tar.gz tk-499d2cfd016df0e17cfd7b96fe70d61a7964a644.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkBusy.c | 6 | ||||
| -rw-r--r-- | generic/tkFont.c | 4 | ||||
| -rw-r--r-- | generic/tkPanedWindow.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c index cad4032..cf66b9e 100644 --- a/generic/tkBusy.c +++ b/generic/tkBusy.c @@ -819,7 +819,7 @@ Tk_BusyObjCmd( if (Tcl_GetString(objv[1])[0] == '.') { if (objc%2 == 1) { - Tcl_WrongNumArgs(interp, 1, objv, "window ?option value ...?"); + Tcl_WrongNumArgs(interp, 1, objv, "window ?-option value ...?"); return TCL_ERROR; } return HoldBusy(busyTablePtr, interp, objv[1], objc-2, objv+2); @@ -865,7 +865,7 @@ Tk_BusyObjCmd( case BUSY_CONFIGURE: if (objc < 3) { - Tcl_WrongNumArgs(interp, 2, objv, "window ?option? ?value ...?"); + Tcl_WrongNumArgs(interp, 2, objv, "window ?-option? ?value ...?"); return TCL_ERROR; } busyPtr = GetBusy(interp, busyTablePtr, objv[2]); @@ -922,7 +922,7 @@ Tk_BusyObjCmd( case BUSY_HOLD: if (objc < 3 || objc%2 != 1) { - Tcl_WrongNumArgs(interp, 2, objv, "window ?option value ...?"); + Tcl_WrongNumArgs(interp, 2, objv, "window ?-option value ...?"); return TCL_ERROR; } return HoldBusy(busyTablePtr, interp, objv[2], objc-3, objv+3); diff --git a/generic/tkFont.c b/generic/tkFont.c index dbc00e4..d2aa6d2 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -556,7 +556,7 @@ Tk_FontObjCmd( if (objc < 3 || n < objc) { Tcl_WrongNumArgs(interp, 2, objv, - "font ?-displayof window? ?option? ?--? ?char?"); + "font ?-displayof window? ?-option? ?--? ?char?"); return TCL_ERROR; } @@ -753,7 +753,7 @@ Tk_FontObjCmd( } if ((objc < 3) || ((objc - skip) > 4)) { Tcl_WrongNumArgs(interp, 2, objv, - "font ?-displayof window? ?option?"); + "font ?-displayof window? ?-option?"); return TCL_ERROR; } tkfont = Tk_AllocFontFromObj(interp, tkwin, objv[2]); diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index bef8c52..b6f64f2 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -690,7 +690,7 @@ PanedWindowWidgetObjCmd( case PW_PANECONFIGURE: if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, - "pane ?option? ?value option value ...?"); + "pane ?-option? ?value -option value ...?"); result = TCL_ERROR; break; } diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index cab9c34..e506b25 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -2377,7 +2377,7 @@ static int TreeviewItemCommand( TreeItem *item; if (objc < 3) { - Tcl_WrongNumArgs(interp, 2, objv, "item ?option ?value??..."); + Tcl_WrongNumArgs(interp, 2, objv, "item ?-option ?value??..."); return TCL_ERROR; } if (!(item = FindItem(interp, tv, objv[2]))) { |