diff options
author | hobbs <hobbs> | 1999-12-22 20:01:07 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 1999-12-22 20:01:07 (GMT) |
commit | 82910603b0e4d9c0fe57e826977e1f63eb12c3f7 (patch) | |
tree | c3c034b8b2f399802ef45b51f013a84fa3d009ef /generic/tkScale.c | |
parent | c09bb648b62bbb6099ed35e1aa45f769aaa1c2c7 (diff) | |
download | tk-82910603b0e4d9c0fe57e826977e1f63eb12c3f7.zip tk-82910603b0e4d9c0fe57e826977e1f63eb12c3f7.tar.gz tk-82910603b0e4d9c0fe57e826977e1f63eb12c3f7.tar.bz2 |
* generic/tkScale.c:
* generic/tkScale.h:
* mac/tkMacScale.c:
* unix/tkUnixScale.c: fixed potential segv from patch in 3897
Diffstat (limited to 'generic/tkScale.c')
-rw-r--r-- | generic/tkScale.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tkScale.c b/generic/tkScale.c index ee942e9..cb1fdce 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -18,7 +18,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkScale.c,v 1.9 1999/12/21 23:55:11 hobbs Exp $ + * RCS: @(#) $Id: tkScale.c,v 1.10 1999/12/22 20:01:07 hobbs Exp $ */ #include "tkPort.h" @@ -1084,6 +1084,7 @@ ScaleCmdDeletedProc(clientData) */ if (!(scalePtr->flags & SCALE_DELETED)) { + scalePtr->flags |= SCALE_DELETED; Tk_DestroyWindow(tkwin); } } @@ -1114,11 +1115,11 @@ TkEventuallyRedrawScale(scalePtr, what) * or REDRAW_ALL. */ { if ((what == 0) || (scalePtr->tkwin == NULL) - || (scalePtr->flags & SCALE_DELETED) || !Tk_IsMapped(scalePtr->tkwin)) { return; } - if ((scalePtr->flags & REDRAW_ALL) == 0) { + if (!(scalePtr->flags & REDRAW_PENDING)) { + scalePtr->flags |= REDRAW_PENDING; Tcl_DoWhenIdle(TkpDisplayScale, (ClientData) scalePtr); } scalePtr->flags |= what; |