diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-07-21 20:06:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-07-21 20:06:34 (GMT) |
| commit | a80e603c517d2682ef25067ac6daf1d2692d5864 (patch) | |
| tree | cd7aaee28e7876e8bfdd77e835c534b13cbe5f98 /macosx/tkMacOSXNotify.c | |
| parent | 682d30ed7f59d3c732d08cf6ccc715e738784453 (diff) | |
| parent | 2aa945d6a8109c74d9ff3331fb99a093635e0cd7 (diff) | |
| download | tk-a80e603c517d2682ef25067ac6daf1d2692d5864.zip tk-a80e603c517d2682ef25067ac6daf1d2692d5864.tar.gz tk-a80e603c517d2682ef25067ac6daf1d2692d5864.tar.bz2 | |
merge 8.6bug_450bb0ecad
Diffstat (limited to 'macosx/tkMacOSXNotify.c')
| -rw-r--r-- | macosx/tkMacOSXNotify.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c index 1455688..f14e1b8 100644 --- a/macosx/tkMacOSXNotify.c +++ b/macosx/tkMacOSXNotify.c @@ -270,10 +270,15 @@ TkMacOSXEventsCheckProc( inMode:GetRunLoopMode(modalSession) dequeue:NO]; /* We must not steal any events during LiveResize. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (testEvent && [[testEvent window] inLiveResize]) { break; } - +#else + if (testEvent && [[[testEvent window] contentView] inLiveResize]) { + break; + } +#endif currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:GetRunLoopMode(modalSession) |