Skip to content

Commit

Permalink
Fix [82d5a93a46]: 8.6 Documentation/comment typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Feb 16, 2024
1 parent ed7e89f commit f8e0440
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion doc/FindPhoto.3
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ data (e.g. separate planes for the red, green, blue and alpha
channels). Unfortunately, the implementation fails to hold this
promise. The problem is that the \fIpixelSize\fR field is
(incorrectly) used to determine whether the image has an alpha channel.
Currently, if the offset for the alpha channel is greater or equal than
Currently, if the offset for the alpha channel is greater than or equal to
\fIpixelSize\fR, \fBtk_PhotoPutblock\fR assumes no alpha data is
present and makes the image fully opaque. This means that for layouts
where the channels are separate (or any other exotic layout where
Expand Down
2 changes: 1 addition & 1 deletion generic/tkFocus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ FindDisplayFocusInfo(
* None.
*
* Side effects:
* This mainPtr should no long access focus information.
* This mainPtr should no longer access focus information.
*
*----------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion generic/tkImgPhInstance.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,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.
*/
Expand Down
2 changes: 1 addition & 1 deletion generic/tkIntXlibDecls.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#endif

/* Some (older) versions of X11/Xutil.h have a wrong signature of those
two functions, so move them out of the way temporarly. */
two functions, so move them out of the way temporarily. */
#define XOffsetRegion _XOffsetRegion
#define XUnionRegion _XUnionRegion
#include "X11/Xutil.h"
Expand Down
2 changes: 1 addition & 1 deletion generic/tkTextBTree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion generic/tkTextDisp.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,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
Expand Down
4 changes: 2 additions & 2 deletions generic/tkTextMark.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions macosx/README
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ platforms, and the fix ultimately required changes in the generic Tk
implementation (documented in the comments in the DisplayText
function).

The Text widget attempts to improve perfomance when scrolling by
The Text widget attempts to improve performance when scrolling by
minimizing the number of text lines which need to be redisplayed. It
does this by calling the platform-specific TkScrollWindow function
which uses a low-level routine to map one rectangle of the window to
Expand All @@ -650,7 +650,7 @@ then used by the Text widget's DisplayText function to determine which
text lines need to be redrawn. On the unix and win platforms, this
damage region includes bounding rectangles for all embedded windows
inside the Text widget. The way that this works is system dependent.
On unix, the low level scrolling is done by XCopyRegion, which
On unix, the low level scrolling is done by XCopyArea, which
generates a GraphicsExpose event for each embedded window. These
GraphicsExposed events are processsed within TkScrollWindow, using a
special handler which adds the bounding rectangle of each subwindow to
Expand Down
2 changes: 1 addition & 1 deletion macosx/tkMacOSXBitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ typedef struct {
} BuiltInIcon;

/*
* This array mapps a string name to the supported builtin icons
* This array maps a string name to the supported builtin icons
* on the Macintosh.
*/

Expand Down
2 changes: 1 addition & 1 deletion macosx/tkMacOSXImage.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ XCreateImage(
ximage->bitmap_pad = bitmap_pad;
} else {
/*
* Use 16 byte alignment for best Quartz perfomance.
* Use 16 byte alignment for best Quartz performance.
*/

ximage->bitmap_pad = 128;
Expand Down
4 changes: 2 additions & 2 deletions tests/textIndex.test
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ test textIndex-25.1 {IndexCountBytesOrdered, bug [3f1f79abcf]} {
destroy .t2
} {}

test textIndex-26.1 {GetIndex restricts the returned index to -starline/-endline in peers, bug [34db75c0ac]} {
test textIndex-26.1 {GetIndex restricts the returned index to -startline/-endline in peers, bug [34db75c0ac]} {
set res {}
pack [text .t2]
.t2 insert end "line 1\nline 2\nline 3\nline 4\nline 5\nline 6\n"
Expand All @@ -998,7 +998,7 @@ test textIndex-26.1 {GetIndex restricts the returned index to -starline/-endline
destroy .t2 .p2
set res
} {2.0 2.0 2.0}
test textIndex-26.2 {GetIndex errors out if mark, image, window, or tag is outside peer -starline/-endline, bug [34db75c0ac]} {
test textIndex-26.2 {GetIndex errors out if mark, image, window, or tag is outside peer -startline/-endline, bug [34db75c0ac]} {
set res {}
pack [text .t2]
.t2 insert end "line 1\nline 2\nline 3\nline 4\nline 5\nline 6\n"
Expand Down
10 changes: 5 additions & 5 deletions win/tkWinDialog.c
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ ColorDlgHookProc(
/*
*----------------------------------------------------------------------
*
* Tk_GetOpenFileCmd --
* Tk_GetOpenFileObjCmd --
*
* This function implements the "open file" dialog box for the Windows
* platform. See the user documentation for details on what it does.
Expand All @@ -965,16 +965,16 @@ Tk_GetOpenFileObjCmd(
/*
*----------------------------------------------------------------------
*
* Tk_GetSaveFileCmd --
* Tk_GetSaveFileObjCmd --
*
* Same as Tk_GetOpenFileCmd but opens a "save file" dialog box
* Same as Tk_GetOpenFileObjCmd but opens a "save file" dialog box
* instead
*
* Results:
* Same as Tk_GetOpenFileCmd.
* Same as Tk_GetOpenFileObjCmd.
*
* Side effects:
* Same as Tk_GetOpenFileCmd.
* Same as Tk_GetOpenFileObjCmd.
*
*----------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion win/tkWinDraw.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ XCopyPlane(
*
* TkPutImage, XPutImage --
*
* Copies a subimage from an in-memory image to a rectangle of of the
* Copies a subimage from an in-memory image to a rectangle of the
* specified drawable.
*
* Results:
Expand Down
2 changes: 1 addition & 1 deletion win/tkWinWm.c
Original file line number Diff line number Diff line change
Expand Up @@ -8592,7 +8592,7 @@ TkpWinToplevelOverrideRedirect(
*
* TkpWinToplevelDetachWindow --
*
* This function is to be usd for changing a toplevel's wrapper or
* This function is to be used for changing a toplevel's wrapper or
* container.
*
* Results:
Expand Down

0 comments on commit f8e0440

Please sign in to comment.