diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkButton.c | 11 |
2 files changed, 8 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2000-08-23 Jeff Hobbs <hobbs@scriptics.com> + + * generic/tkButton.c (ButtonTextVarProc): reversed change below, + it was not correct. + 2000-08-22 Jeff Hobbs <hobbs@scriptics.com> * generic/tkButton.c (ButtonTextVarProc): changed order of diff --git a/generic/tkButton.c b/generic/tkButton.c index e761137..bc97641 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkButton.c,v 1.9 2000/08/23 00:08:45 hobbs Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.10 2000/08/23 19:18:19 hobbs Exp $ */ #include "tkButton.h" @@ -1645,14 +1645,9 @@ ButtonTextVarProc(clientData, interp, name1, name2, flags) if (valuePtr == NULL) { valuePtr = Tcl_NewObj(); } - /* - * Incr valuePtr before Decr, in case they point to the same object. - * We could also do some short-circuiting in that case, but it - * shouldn't happen in practice. - */ - Tcl_IncrRefCount(valuePtr); - butPtr->textPtr = valuePtr; Tcl_DecrRefCount(butPtr->textPtr); + butPtr->textPtr = valuePtr; + Tcl_IncrRefCount(butPtr->textPtr); TkpComputeButtonGeometry(butPtr); if ((butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin) |