diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-22 08:58:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-22 08:58:46 (GMT) |
| commit | 452161e760ca95d60fbbf4b8e3547102ef2b035d (patch) | |
| tree | 483ce24a68b633ea0dbc6b282d550f31e07dbe6f /generic | |
| parent | 81ac88e72f468bd35eb1eb30d6947b6feb0af48d (diff) | |
| parent | e64d38045b3d09b51e7f212794155a7df8b0bc1f (diff) | |
| download | tk-452161e760ca95d60fbbf4b8e3547102ef2b035d.zip tk-452161e760ca95d60fbbf4b8e3547102ef2b035d.tar.gz tk-452161e760ca95d60fbbf4b8e3547102ef2b035d.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCanvLine.c | 6 | ||||
| -rw-r--r-- | generic/tkCanvPoly.c | 5 | ||||
| -rw-r--r-- | generic/tkCanvText.c | 5 | ||||
| -rw-r--r-- | generic/tkMenubutton.h | 8 |
4 files changed, 4 insertions, 20 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index 504ca61..c6d61fa 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -1924,12 +1924,6 @@ GetLineIndex( coordPtr += 2; } } else { - - /* - * Some of the paths here leave messages in interp->result, so we have to - * clear it out before storing our own message. - */ - badIndex: Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad index \"%s\"", string)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "ITEM_INDEX", "LINE", NULL); diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index 0a69fa7..d7b164a 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -1764,11 +1764,6 @@ GetPolygonIndex( coordPtr += 2; } } else { - /* - * Some of the paths here leave messages in interp->result, so we have to - * clear it out before storing our own message. - */ - badIndex: Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad index \"%s\"", string)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "ITEM_INDEX", "POLY", NULL); diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 3adb43d..2407918 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -1523,11 +1523,6 @@ GetTextIndex( *indexPtr = Tk_PointToChar(textPtr->textLayout, (int) (x*cs - y*s), (int) (y*cs + x*s)); } else { - /* - * Some of the paths here leave messages in the interp's result, so we - * have to clear it out before storing our own message. - */ - badIndex: Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad index \"%s\"", string)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "ITEM_INDEX", "TEXT", NULL); diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h index 043c88d..16ed223 100644 --- a/generic/tkMenubutton.h +++ b/generic/tkMenubutton.h @@ -161,12 +161,12 @@ typedef struct { * whether the menubutton should show both an * image and text, and, if so, how. */ enum direction direction; /* Direction for where to pop the menu. Valid - * directions are "above", "below", "left", - * "right", and "flush". "flush" means that - * the upper left corner of the menubutton is - * where the menu pops up. "above" and "below" + * directions are "above", "below", "flush", + * "left", and "right". "above" and "below" * will attempt to pop the menu completely * above or below the menu respectively. + * "flush" means that the upper left corner + * of the menubutton is where the menu pops up. * "left" and "right" will pop the menu left * or right, and the active item will be next * to the button. */ |