diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3 index 57d0b7724..066371ef0 100644 --- a/doc/FindPhoto.3 +++ b/doc/FindPhoto.3 @@ -263,7 +263,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 diff --git a/generic/tkFocus.c b/generic/tkFocus.c index 647737381..4438f1a45 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 f498d9557..c669b41bc 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/tkTextDisp.c b/generic/tkTextDisp.c index bebcc598c..81f0a2b14 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -198,7 +198,7 @@ typedef struct TkTextDispLine DLine; * time the display was updated. * 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 or bottom than if + * 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 similar background). * BOTTOM_LINE - Non-zero means that this was the bottom line in the window the last diff --git a/macosx/README b/macosx/README index 43f86ada2..64be1404c 100644 --- a/macosx/README +++ b/macosx/README @@ -638,7 +638,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 @@ -647,7 +647,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 diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c index b1fbd1787..39fd6025f 100644 --- a/macosx/tkMacOSXBitmap.c +++ b/macosx/tkMacOSXBitmap.c @@ -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. */ diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index adf5d394f..3aa3853ea 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -419,7 +419,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; diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index 94b76e049..51901c93c 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -317,7 +317,6 @@ VISIBILITY_HIDDEN NSArray *_defaultApplicationMenuItems, *_defaultWindowsMenuItems; NSArray *_defaultHelpMenuItems, *_defaultFileMenuItems; NSAutoreleasePool *_mainPool; - NSThread *_backgoundLoop; } @property int poolLock; @property int macOSVersion; diff --git a/tests/textIndex.test b/tests/textIndex.test index e55296a19..aeba394b0 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -1054,7 +1054,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" @@ -1065,7 +1065,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" diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 23e2814b4..c414c47f9 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -882,7 +882,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. @@ -909,16 +909,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. * *---------------------------------------------------------------------- */ diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index ec5b7b427..7943aa312 100644 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.c @@ -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: diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 9987651e1..16072d773 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -8516,7 +8516,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: