diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-18 13:03:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-18 13:03:38 (GMT) |
| commit | 3b8b8111591d66d2fa3364971c7c17181ed872d5 (patch) | |
| tree | 50d04c2abe85107c4e62282225cbba5bd5c952cc /generic/tkText.c | |
| parent | 2e7b097afc15bc6b6fad5e18b7bd69d961e9b349 (diff) | |
| parent | 5442c2a77a9c025b2245d42dbae20829f03be9bc (diff) | |
| download | tk-3b8b8111591d66d2fa3364971c7c17181ed872d5.zip tk-3b8b8111591d66d2fa3364971c7c17181ed872d5.tar.gz tk-3b8b8111591d66d2fa3364971c7c17181ed872d5.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 8ae17a5..4f25222 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -1570,8 +1570,7 @@ TextWidgetObjCmd( } done: - textPtr->refCount--; - if (textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); } return result; @@ -1964,9 +1963,7 @@ DestroyText( * portion of the text widget. */ - sharedTextPtr->refCount--; - - if (sharedTextPtr->refCount > 0) { + if (sharedTextPtr->refCount-- > 1) { TkBTreeRemoveClient(sharedTextPtr->tree, textPtr); /* @@ -2042,13 +2039,12 @@ DestroyText( } textPtr->tkwin = NULL; - textPtr->refCount--; Tcl_DeleteCommandFromToken(textPtr->interp, textPtr->widgetCmd); if (textPtr->afterSyncCmd){ Tcl_DecrRefCount(textPtr->afterSyncCmd); textPtr->afterSyncCmd = NULL; } - if (textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree(textPtr); } } @@ -5612,7 +5608,7 @@ RunAfterSyncCmd( * The widget has been deleted. Don't do anything. */ - if (--textPtr->refCount == 0) { + if (textPtr->refCount-- <= 1) { ckfree((char *) textPtr); } return; |