summaryrefslogtreecommitdiffstats
path: root/generic/tkScale.c
diff options
context:
space:
mode:
authorhobbs <hobbs@noemail.net>1999-12-22 20:01:07 (GMT)
committerhobbs <hobbs@noemail.net>1999-12-22 20:01:07 (GMT)
commit25afad71b2b10f837780c68ff2b64c04ef359fbb (patch)
treec3c034b8b2f399802ef45b51f013a84fa3d009ef /generic/tkScale.c
parente61313b2ce8313ccbdd99c4357006cbe93ddeed9 (diff)
downloadtk-25afad71b2b10f837780c68ff2b64c04ef359fbb.zip
tk-25afad71b2b10f837780c68ff2b64c04ef359fbb.tar.gz
tk-25afad71b2b10f837780c68ff2b64c04ef359fbb.tar.bz2
* generic/tkScale.c:
* generic/tkScale.h: * mac/tkMacScale.c: * unix/tkUnixScale.c: fixed potential segv from patch in 3897 FossilOrigin-Name: aacfa41407752d13d0f211e542203a0ddcd404c7
Diffstat (limited to 'generic/tkScale.c')
-rw-r--r--generic/tkScale.c7
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;