diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-16 15:22:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-16 15:22:47 (GMT) |
| commit | 5ae0e88cc49f83ebe127f1aebddadc4e5d7c1990 (patch) | |
| tree | 0e42252ab9eb6de4d6106e59412ae2e95765ea89 /generic | |
| parent | 2d5bd258efa4930673224605e1bd76b0badcef46 (diff) | |
| parent | f8e0440984fd76b924ce69b6b049d4333088933b (diff) | |
| download | tk-5ae0e88cc49f83ebe127f1aebddadc4e5d7c1990.zip tk-5ae0e88cc49f83ebe127f1aebddadc4e5d7c1990.tar.gz tk-5ae0e88cc49f83ebe127f1aebddadc4e5d7c1990.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFocus.c | 2 | ||||
| -rw-r--r-- | generic/tkImgPhInstance.c | 2 | ||||
| -rw-r--r-- | generic/tkTextBTree.c | 2 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 2 | ||||
| -rw-r--r-- | generic/tkTextMark.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkFocus.c b/generic/tkFocus.c index 6477373..4438f1a 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -1049,7 +1049,7 @@ FindDisplayFocusInfo( * None. * * Side effects: - * This mainPtr should no long access focus information. + * This mainPtr should no longer access focus information. * *---------------------------------------------------------------------- */ diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c index f498d95..c669b41 100644 --- a/generic/tkImgPhInstance.c +++ b/generic/tkImgPhInstance.c @@ -716,7 +716,7 @@ TkImgPhotoDisplay( Tk_DeleteErrorHandler(handler); } else { /* - * modelPtr->region describes which parts of the image contain valid + * modelPtr->validRegion describes which parts of the image contain valid * data. We set this region as the clip mask for the gc, setting its * origin appropriately, and use it when drawing the image. */ diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 5fcb163..fc55937 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -614,7 +614,7 @@ static void AdjustStartEndRefs( BTree *treePtr, /* The entire B-tree. */ TkText *textPtr, /* The text widget for which we want to adjust - * it's start and end cache. */ + * its start and end cache. */ int action) /* Action to perform. */ { if (action & TEXT_REMOVE_REFS) { diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 2b6a1fe..b7ab109 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -289,7 +289,7 @@ typedef struct DLine { * TOP_LINE - Non-zero means that this was the top line in * in the window the last time that the window * was laid out. This is important because a line - * may be displayed differently if its at the top + * may be displayed differently if it's at the top * or bottom than if it's in the middle * (e.g. beveled edges aren't displayed for * middle lines if the adjacent line has a diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c index ca3cba0..b25e4dd 100644 --- a/generic/tkTextMark.c +++ b/generic/tkTextMark.c @@ -411,10 +411,10 @@ TkTextMarkSegToIndex( * * Results: * The return value is TCL_OK if "name" exists as a mark in the text - * widget and is located within its -starline/-endline range. In this + * widget and is located within its -startline/-endline range. In this * case *indexPtr is filled in with the next segment who is after the * mark whose size is non-zero. TCL_ERROR is returned if the mark - * doesn't exist in the text widget, or if it is out of its -starline/ + * doesn't exist in the text widget, or if it is out of its -startline/ * -endline range. In this latter case *indexPtr still contains valid * information, in particular TkTextMarkNameToIndex called with the * "insert" or "current" mark name may return TCL_ERROR, but *indexPtr |