diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-10-18 14:09:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-10-18 14:09:28 (GMT) |
| commit | 6319848c51d2eecc9e638d2dcc90b1a4c1a89533 (patch) | |
| tree | 4d5da914dcf9c56c6a716414de8b13a3fdfdd3c5 /generic | |
| parent | de5ba4f4af937590dcb3152f3a2fc5e410411299 (diff) | |
| parent | 9c8775d94cb717eba05c7ad9ac9b16712898e637 (diff) | |
| download | tk-6319848c51d2eecc9e638d2dcc90b1a4c1a89533.zip tk-6319848c51d2eecc9e638d2dcc90b1a4c1a89533.tar.gz tk-6319848c51d2eecc9e638d2dcc90b1a4c1a89533.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 2 | ||||
| -rw-r--r-- | generic/tkGrab.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 71008bc..8138c34 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -908,7 +908,7 @@ RecomputeWidgets( * * This could be done recursively or iteratively. The recursive version is * easier to implement and understand, and typically, windows with a -font - * option will be leaf nodes in the widget heirarchy (buttons, labels, + * option will be leaf nodes in the widget hierarchy (buttons, labels, * etc.), so the recursion depth will be shallow. * * However, the additional overhead of the recursive calls may become a diff --git a/generic/tkGrab.c b/generic/tkGrab.c index 787a2e2..2232ba5 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -26,7 +26,7 @@ * grab state information: the current grab window, the current restrict * window, and whether the mouse is captured. * - * The current grab window specifies the point in the Tk window heirarchy + * The current grab window specifies the point in the Tk window hierarchy * above which pointer events will not be reported. Any window within the * subtree below the grab window will continue to receive events as normal. * Events outside of the grab tree will be reported to the grab window. |