diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-01-29 16:08:12 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-01-29 16:08:12 (GMT) |
| commit | 5f9bf4fde729afc768b4c4b30fa778dc6f637605 (patch) | |
| tree | 7dae4b8708bb19be78dd5daaafe941d7d5b6128b /generic/tkTextDisp.c | |
| parent | 5be70aeb76c7c6ba94c9288632ddf1c094108f0e (diff) | |
| parent | bc6a00f386a42a918f7ea3907a7899419680c3d4 (diff) | |
| download | tk-5f9bf4fde729afc768b4c4b30fa778dc6f637605.zip tk-5f9bf4fde729afc768b4c4b30fa778dc6f637605.tar.gz tk-5f9bf4fde729afc768b4c4b30fa778dc6f637605.tar.bz2 | |
Merge core-8-6-branch
Diffstat (limited to 'generic/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 4b7b0db..371e910 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -3005,7 +3005,7 @@ AsyncUpdateLineMetrics( * The widget has been deleted, or is not mapped. Don't do anything. */ - if (--textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); } return; @@ -3080,8 +3080,7 @@ AsyncUpdateLineMetrics( GenerateWidgetViewSyncEvent(textPtr, 1); - textPtr->refCount--; - if (textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); } return; @@ -4163,7 +4162,7 @@ DisplayText( textPtr->refCount++; dInfoPtr->flags &= ~REPICK_NEEDED; TkTextPickCurrent(textPtr, &textPtr->pickEvent); - if (--textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); goto end; } @@ -4299,8 +4298,9 @@ DisplayText( if (TkScrollWindow(textPtr->tkwin, dInfoPtr->scrollGC, dInfoPtr->x, oldY, dInfoPtr->maxX-dInfoPtr->x, height, 0, y-oldY, damageRgn)) { +#ifndef MAC_OSX_TK TextInvalidateRegion(textPtr, damageRgn); - +#endif } numCopies++; TkDestroyRegion(damageRgn); @@ -6752,7 +6752,7 @@ AsyncUpdateYScrollbar( GetYView(textPtr->interp, textPtr, 1); } - if (--textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); } } |