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 /win | |
| 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 'win')
| -rw-r--r-- | win/tkWinWm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 6ca52b9..3c9946e 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -7900,7 +7900,7 @@ WmProc( winPtr = GetTopLevel(hwnd); if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) { /* - * This window is outside the grab heirarchy, so don't let any of + * This window is outside the grab hierarchy, so don't let any of * the normal non-client processing occur. Note that this * implementation is not strictly correct because the grab might * change between now and when the event would have been processed |