diff options
| author | lfb <lfb> | 1999-01-07 02:42:48 (GMT) |
|---|---|---|
| committer | lfb <lfb> | 1999-01-07 02:42:48 (GMT) |
| commit | 89aede68cdad0d2c46f898878aaeb6938693dc7b (patch) | |
| tree | 2237ce3d80844c66482463c126b446a218e8fca3 /unix | |
| parent | a680377f5ddddc62a98638e7ab6280eab77c939e (diff) | |
| download | tk-89aede68cdad0d2c46f898878aaeb6938693dc7b.zip tk-89aede68cdad0d2c46f898878aaeb6938693dc7b.tar.gz tk-89aede68cdad0d2c46f898878aaeb6938693dc7b.tar.bz2 | |
Removed perky gloabal Tk_Uids causing concurrency problems.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixMenubu.c | 9 | ||||
| -rw-r--r-- | unix/tkUnixScale.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 9f203b9..6d756d3 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixMenubu.c,v 1.1.4.1 1998/09/30 02:19:20 stanton Exp $ + * RCS: @(#) $Id: tkUnixMenubu.c,v 1.1.4.2 1999/01/07 02:42:57 lfb Exp $ */ #include "tkMenubutton.h" @@ -84,10 +84,11 @@ TkpDisplayMenuButton(clientData) return; } - if ((mbPtr->state == tkDisabledUid) && (mbPtr->disabledFg != NULL)) { + if ((mbPtr->state == TK_STATE_DISABLED) && (mbPtr->disabledFg != NULL)) { gc = mbPtr->disabledGC; border = mbPtr->normalBorder; - } else if ((mbPtr->state == tkActiveUid) && !Tk_StrictMotif(mbPtr->tkwin)) { + } else if ((mbPtr->state == TK_STATE_ACTIVE) + && !Tk_StrictMotif(mbPtr->tkwin)) { gc = mbPtr->activeTextGC; border = mbPtr->activeBorder; } else { @@ -142,7 +143,7 @@ TkpDisplayMenuButton(clientData) * foreground color, generate the stippled effect. */ - if ((mbPtr->state == tkDisabledUid) + if ((mbPtr->state == TK_STATE_DISABLED) && ((mbPtr->disabledFg == NULL) || (mbPtr->image != NULL))) { XFillRectangle(mbPtr->display, pixmap, mbPtr->disabledGC, mbPtr->inset, mbPtr->inset, diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index 86e0cf5..431cf9c 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixScale.c,v 1.1.4.1 1998/09/30 02:19:21 stanton Exp $ + * RCS: @(#) $Id: tkUnixScale.c,v 1.1.4.2 1999/01/07 02:42:57 lfb Exp $ */ #include "tkScale.h" @@ -177,7 +177,7 @@ DisplayVerticalScale(scalePtr, drawable, drawnAreaPtr) (unsigned) scalePtr->width, (unsigned) (Tk_Height(tkwin) - 2*scalePtr->inset - 2*scalePtr->borderWidth)); - if (scalePtr->state == tkActiveUid) { + if (scalePtr->state == TK_STATE_ACTIVE) { sliderBorder = scalePtr->activeBorder; } else { sliderBorder = scalePtr->bgBorder; @@ -376,7 +376,7 @@ DisplayHorizontalScale(scalePtr, drawable, drawnAreaPtr) (unsigned) (Tk_Width(tkwin) - 2*scalePtr->inset - 2*scalePtr->borderWidth), (unsigned) scalePtr->width); - if (scalePtr->state == tkActiveUid) { + if (scalePtr->state == TK_STATE_ACTIVE) { sliderBorder = scalePtr->activeBorder; } else { sliderBorder = scalePtr->bgBorder; |