Merge 8.6

19 files changed, 24 insertions, 24 deletions

diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index 9c2fccc..a2af41b 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -1014,7 +1014,7 @@ BitmapInit(
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
-     * First initialize the data in the ThreadSpecificData strucuture, if
+     * First initialize the data in the ThreadSpecificData structure, if
      * needed.
      */
 
@@ -1169,7 +1169,7 @@ TkDebugBitmap(
  *
  * TkGetBitmapPredefTable --
  *
- *	This function is used by tkMacBitmap.c to access the thread-specific
+ *	This function is used by tkMacOSXBitmap.c to access the thread-specific
  *	predefBitmap table that maps from the names of the predefined bitmaps
  *	to data associated with those bitmaps. It is required because the
  *	table is allocated in thread-local storage and is not visible outside
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 0b37119..6ed9ffb 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -2007,7 +2007,7 @@ TkDeleteThreadExitHandler(
  * TkFinalize --
  *
  *	Runs our private exit handlers and removes itself from Tcl. This is
- *	benificial should we want to protect from dangling pointers should the
+ *	beneficial should we want to protect from dangling pointers should the
  *	Tk shared library be unloaded prior to Tcl which can happen on windows
  *	should the process be forcefully exiting from an exception handler.
  *
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 209de6f..b8f7796 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -3503,7 +3503,7 @@ Tk_PhotoPutBlock(
     if (alphaOffset) {
 	/*
 	 * This block is grossly inefficient. For each row in the image, it
-	 * finds each continguous string of nontransparent pixels, then marks
+	 * finds each contiguous string of nontransparent pixels, then marks
 	 * those areas as valid in the validRegion mask. This makes drawing
 	 * very efficient, because of the way we use X: we just say, here's
 	 * your mask, and here's your data. We need not worry about the
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 1577be9..bc9b58d 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -1055,8 +1055,8 @@ FreeWindowInternalRep(
  *
  * Tk_NewWindowObj --
  *
- *	This function allocates a new Tcl_Obj that refers to a particular to a
- *	particular Tk window.
+ *	This function allocates a new Tcl_Obj that refers to a particular
+ *	Tk window.
  *
  * Results:
  *	A standard Tcl object reference, with refcount 0.
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 7147ad2..f422260 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -410,7 +410,7 @@ Tk_PanedWindowObjCmd(
 	/*
 	 * The first time this function is invoked, the option tables will be
 	 * NULL. We then create the option tables from the templates and store
-	 * a pointer to the tables as the command's clinical so we'll have
+	 * a pointer to the tables as the command's clientData so we'll have
 	 * easy access to it in the future.
 	 */
 
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index 9b38352..78680f9 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -1898,7 +1898,7 @@ TkBTreePreviousLine(
  *	height of the given line).
  *
  *	Since the last line of text (the artificial one) has zero height by
- *	defintion, calling this with the last line will return the total
+ *	definition, calling this with the last line will return the total
  *	number of pixels in the widget.
  *
  * Results:
diff --git a/library/demos/puzzle.tcl b/library/demos/puzzle.tcl
index eebe87a..f06de5d 100644
--- a/library/demos/puzzle.tcl
+++ b/library/demos/puzzle.tcl
@@ -11,7 +11,7 @@ package require Tk
 
 # puzzleSwitch --
 # This procedure is invoked when the user clicks on a particular button;
-# if the button is next to the empty space, it moves the button into th
+# if the button is next to the empty space, it moves the button into the
 # empty space.
 
 proc puzzleSwitch {w num} {
diff --git a/macosx/README b/macosx/README
index 52cbb1e..49e614e 100644
--- a/macosx/README
+++ b/macosx/README
@@ -545,7 +545,7 @@ appropriate place to drain the main NSAutoreleasePool and replace it
 with a new pool.  This is done by calling the method [NSApp
 _resetAutoreleasePool], where _resetAutoreleasePool is a method which
 we define for the subclass.  Unfortunately, by itself this is not
-sufficient for safe memory managememt because, as was made painfully
+sufficient for safe memory management because, as was made painfully
 evident with the release of OS X 10.13, it is possible for calls to
 TclDoOneEvent, and hence to CheckProc, to be nested.  Draining the
 autorelease pool in a nested call leads to crashes as objects in use
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index ffb520d..4732ddb 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -299,7 +299,7 @@ GetRGBA(
 
 	/*
 	 * Prior to OSX 10.14, getComponents returns black when applied to
-	 * windowBackGroundColor.
+	 * windowBackgroundColor.
 	 */
 
 	if ([NSApp macOSVersion] < 101400) {
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 278c729..0b03b8c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -416,7 +416,7 @@ TkpInit(
 
     /*
      * TkpInit can be called multiple times with different interpreters. But
-     * The application initialization should only be done onece.
+     * The application initialization should only be done once.
      */
 
     if (!initialized) {
@@ -477,7 +477,7 @@ TkpInit(
          * the application icon, will be delivered before the procedure meant
          * to to handle the AppleEvent has been defined.  This is handled in
          * tkMacOSXHLEvents.c by scheduling a timer event to handle the
-         * ApplEvent later, after the required procedure has been defined.
+         * AppleEvent later, after the required procedure has been defined.
          */
 
 	[NSApp _setup:interp];
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 7b8a599..36b45ff 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -121,7 +121,7 @@ static int	ModifierCharWidth(Tk_Font tkfont);
  * demo would cause the animation to stop.  This was also the case for
  * menubuttons.
  *
- * The TKBackground object below works around this problem, and allows a Tk
+ * The TKBackgroundLoop object below works around this problem, and allows a Tk
  * event loop to run while a menu is open.  It is a subclass of NSThread which
  * inserts requests to call [NSApp _runBackgroundLoop] onto the queue
  * associated with the NSEventTrackingRunLoopMode.  One of these threads gets
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 891421f..9cb2033 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -258,7 +258,7 @@ enum {
 	}
 
 	/*
-	 * If this click will change the focus, the Tk event event should
+	 * If this click will change the focus, the Tk event should
 	 * be sent to the toplevel which will be receiving focus rather than to
 	 * the current focus window.  So reset tkEventTarget.
 	 */
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 293e7ea..19441c5 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -344,7 +344,7 @@ TkMacOSXNotifyExitHandler(
  *       deQueue=NO so that it will not change anything on the AppKit event
  *       queue, because we only want the side effect that it runs drawRect. The
  *       only times when any NSViews have the needsDisplay property set to YES
- *       are during execution of this function or in the addDirtyRect method
+ *       are during execution of this function or in the addTkDirtyRect method
  *       of TKContentView.
  *
  *       The reason for running this function as an idle task is to try to
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 297774e..d990c81 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -457,7 +457,7 @@ static void RefocusGrabWindow(void *data) {
  *      being run inside of the drawRect method. If not, it may be desirable
  *      for the display procedure to simply clear the REDRAW_PENDING flag
  *      and return.  The widget can be recorded in order to schedule a
- *      redraw, via and Expose event, from within drawRect.
+ *      redraw, via an Expose event, from within drawRect.
  *
  *      This is also needed for some tests, especially of the Text widget,
  *      which record data in a global Tcl variable and assume that display
@@ -1014,7 +1014,7 @@ ConfigureRestrictProc(
 
     /*
      * Make sure that the layer uses a contentScale that matches the
-     * backing scale factor of the screen.  This avoids blurry text whe
+     * backing scale factor of the screen.  This avoids blurry text when
      * the view is on a Retina display, as well as incorrect size when
      * the view is on a normal display.
      */
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 4ecb6c9..fcfe247 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6027,7 +6027,7 @@ WmWinTabbingId(
  *	allows you to get or set the appearance for the NSWindow associated
  *	with a Tk Window.  The syntax is:
  *
- *	    tk::unsupported::MacWindowStyle tabbingid window ?newAppearance?
+ *	    tk::unsupported::MacWindowStyle appearance window ?newAppearance?
  *
  *      Allowed appearance names are "aqua", "darkaqua", and "auto".
  *
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 2a2acd8..0a52d80 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -236,7 +236,7 @@ static CGRect NormalizeButtonBounds(
  */
 
 /*
- * For systems older than 10.14, [NSColor windowBackGroundColor] generates
+ * For systems older than 10.14, [NSColor windowBackgroundColor] generates
  * garbage when called from this function.  In 10.14 it works correctly, and
  * must be used in order to have a background color which responds to Dark
  * Mode.  So we use this hard-wired RGBA color on the older systems which don't
diff --git a/unix/tkUnixDialog.c b/unix/tkUnixDialog.c
index 66f88dc..0109cb7 100644
--- a/unix/tkUnixDialog.c
+++ b/unix/tkUnixDialog.c
@@ -166,7 +166,7 @@ Tk_GetSaveFileObjCmd(
  *	See user documentation.
  *
  * Side effects:
- *	None. The MessageBox window will be destroy before this procedure
+ *	None. The MessageBox window will be destroyed before this procedure
  *	returns.
  *
  *----------------------------------------------------------------------
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 0bfc7f1..ac2bf20 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1840,7 +1840,7 @@ GetFileName(
  *
  * OFNHookProc --
  *
- *	Dialog box hook function. This is used to sets the "tk_dialog"
+ *	Dialog box hook function. This is used to set the "tk_dialog"
  *	variable for test/debugging when the dialog is ready to receive
  *	messages. When multiple file selection is enabled this function
  *	is used to process the list of names.
@@ -2719,7 +2719,7 @@ ChooseDirectoryValidateProc(
  *	See user documentation.
  *
  * Side effects:
- *	None. The MessageBox window will be destroy before this function
+ *	None. The MessageBox window will be destroyed before this function
  *	returns.
  *
  *----------------------------------------------------------------------
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index e568f0c..6ca52b9 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -83,7 +83,7 @@ typedef struct TkWmStackorderToplevelPair {
 
 
 /*
- * A pointer to one of these strucutures is associated with each toplevel.
+ * A pointer to one of these structures is associated with each toplevel.
  * This allows us to free up all memory associated with icon resources when a
  * window is deleted or if the window's icon is changed. They are simply
  * reference counted according to: