diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2009-10-24 00:01:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2009-10-24 00:01:47 (GMT) |
| commit | 111d9451cc192469f7e9d1224dc30bcebe3e82fd (patch) | |
| tree | 1588ba220ec9926c5a4063017aa92302ec0b4241 /unix | |
| parent | 1c3b7359656edd8a158c3056d26d732e01c34994 (diff) | |
| download | tk-111d9451cc192469f7e9d1224dc30bcebe3e82fd.zip tk-111d9451cc192469f7e9d1224dc30bcebe3e82fd.tar.gz tk-111d9451cc192469f7e9d1224dc30bcebe3e82fd.tar.bz2 | |
[Patch 1530276]: Improve no-indicator check/radio buttons on Unix.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixButton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c index 75e4df3..064a2f4 100644 --- a/unix/tkUnixButton.c +++ b/unix/tkUnixButton.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixButton.c,v 1.26 2008/11/05 22:20:59 nijtmans Exp $ + * RCS: @(#) $Id: tkUnixButton.c,v 1.27 2009/10/24 00:01:48 dkf Exp $ */ #include "tkInt.h" @@ -281,7 +281,7 @@ TkpDrawCheckIndicator( for (iy=0 ; iy<dim ; iy++) { for (ix=0 ; ix<dim ; ix++) { XPutPixel(img, ix, iy, - imgColors[button_images[imgstart+iy][imgsel+ix] - 'A'] ); + imgColors[button_images[imgstart+iy][imgsel+ix] - 'A']); } } @@ -295,9 +295,9 @@ TkpDrawCheckIndicator( copyGC = Tk_GetGC(tkwin, 0, &gcValues); XPutImage(display, pixmap, copyGC, img, 0, 0, 0, 0, - (unsigned int)dim, (unsigned int)dim); + (unsigned)dim, (unsigned)dim); XCopyArea(display, pixmap, d, copyGC, 0, 0, - (unsigned int)dim, (unsigned int)dim, x, y); + (unsigned)dim, (unsigned)dim, x, y); /* * Tidy up. @@ -389,8 +389,8 @@ TkpDisplayButton( } else { gc = butPtr->normalTextGC; } - if ((butPtr->flags & SELECTED) && (butPtr->state != STATE_ACTIVE) - && (butPtr->selectBorder != NULL) && !butPtr->indicatorOn) { + if ((butPtr->flags & SELECTED) && (butPtr->selectBorder != NULL) + && !butPtr->indicatorOn) { border = butPtr->selectBorder; } |