diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-01-20 19:23:46 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-01-20 19:23:46 (GMT) |
| commit | 0176b08225a47e5f21586757e0efb9cfe8609fa7 (patch) | |
| tree | 91673cb7b0c95cde596fc08edc9971ecc7a519de /macosx/tkMacOSXWindowEvent.c | |
| parent | 6c0187f324138cc7e5f7aeaafa9718bd32e536c4 (diff) | |
| parent | bbcec99c56690c05359f41e55c6dd7f3461c9aee (diff) | |
| download | tk-0176b08225a47e5f21586757e0efb9cfe8609fa7.zip tk-0176b08225a47e5f21586757e0efb9cfe8609fa7.tar.gz tk-0176b08225a47e5f21586757e0efb9cfe8609fa7.tar.bz2 | |
merge 8.5
Diffstat (limited to 'macosx/tkMacOSXWindowEvent.c')
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 91cc348..fce3801 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -165,6 +165,10 @@ extern BOOL opaqueTag; if (winPtr) { TkGenWMDestroyEvent((Tk_Window) winPtr); + if (_windowWithMouse == w) { + _windowWithMouse = nil; + [w release]; + } } /* @@ -862,12 +866,9 @@ ConfigureRestrictProc( /* * Try to prevent flickers and flashes. - * - * This stops the flickers, but on OSX 10.11 flashes still occur when - * the width of the window is 16, 32, 48, 64, 80, 96, 112, 256, 512, - * 768, ... */ [w disableFlushWindow]; + NSDisableScreenUpdates(); /* Disable Tk drawing until the window has been completely configured.*/ TkMacOSXSetDrawingEnabled(winPtr, 0); @@ -891,6 +892,7 @@ ConfigureRestrictProc( while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {} [w enableFlushWindow]; [w flushWindowIfNeeded]; + NSEnableScreenUpdates(); [NSApp setPoolProtected:NO]; } } |