diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-10-17 19:47:49 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-10-17 19:47:49 (GMT) |
| commit | 981d42a53a17356a5965a039eecccd82d1aebb48 (patch) | |
| tree | b3c7cb3ed6400fd1b8baf7193f27dce03c93d16a /generic | |
| parent | 2f576289dc210ca386257e2e4248ccd81dc420bc (diff) | |
| parent | 87ac61a50e646b5bf6406c7e504838892550cbcc (diff) | |
| download | tk-981d42a53a17356a5965a039eecccd82d1aebb48.zip tk-981d42a53a17356a5965a039eecccd82d1aebb48.tar.gz tk-981d42a53a17356a5965a039eecccd82d1aebb48.tar.bz2 | |
Merge core-8-6-branch that just received changes from unstable_tests branch, and fix conflicts in frame.test. This commit stabilizes several more tests that could sporadically fail on macOS. No test expected results were changed.
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 0010d12..0b1aeeb 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -909,7 +909,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 24bfd83..b6ffbf3 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. |