diff options
| -rw-r--r-- | generic/tkCanvBmap.c | 18 | ||||
| -rw-r--r-- | generic/tkCanvLine.c | 9 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixMenu.c | 8 |
4 files changed, 6 insertions, 33 deletions
diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index 887c554..e38a7f4 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.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: tkCanvBmap.c,v 1.9 2004/01/13 02:06:00 davygrvy Exp $ + * RCS: @(#) $Id: tkCanvBmap.c,v 1.10 2004/06/08 20:28:19 dgp Exp $ */ #include <stdio.h> @@ -606,8 +606,6 @@ DisplayBitmap(canvas, itemPtr, display, drawable, x, y, width, height) BitmapItem *bmapPtr = (BitmapItem *) itemPtr; int bmapX, bmapY, bmapWidth, bmapHeight; short drawableX, drawableY; - XColor *fgColor; - XColor *bgColor; Pixmap bitmap; Tk_State state = itemPtr->state; @@ -620,26 +618,12 @@ DisplayBitmap(canvas, itemPtr, display, drawable, x, y, width, height) if(state == TK_STATE_NULL) { state = ((TkCanvas *)canvas)->canvas_state; } - fgColor = bmapPtr->fgColor; - bgColor = bmapPtr->bgColor; bitmap = bmapPtr->bitmap; if (((TkCanvas *)canvas)->currentItemPtr == itemPtr) { - if (bmapPtr->activeFgColor!=NULL) { - fgColor = bmapPtr->activeFgColor; - } - if (bmapPtr->activeBgColor!=NULL) { - bgColor = bmapPtr->activeBgColor; - } if (bmapPtr->activeBitmap!=None) { bitmap = bmapPtr->activeBitmap; } } else if (state==TK_STATE_DISABLED) { - if (bmapPtr->disabledFgColor!=NULL) { - fgColor = bmapPtr->disabledFgColor; - } - if (bmapPtr->disabledBgColor!=NULL) { - bgColor = bmapPtr->disabledBgColor; - } if (bmapPtr->disabledBitmap!=None) { bitmap = bmapPtr->disabledBitmap; } diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index a10ff55..8017829 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvLine.c,v 1.14 2004/01/13 02:06:00 davygrvy Exp $ + * RCS: @(#) $Id: tkCanvLine.c,v 1.15 2004/06/08 20:28:19 dgp Exp $ */ #include <stdio.h> @@ -858,7 +858,6 @@ DisplayLine(canvas, itemPtr, display, drawable, x, y, width, height) double linewidth; int numPoints; Tk_State state = itemPtr->state; - Pixmap stipple = linePtr->outline.stipple; if ((!linePtr->numPoints)||(linePtr->outline.gc==None)) { return; @@ -869,16 +868,10 @@ DisplayLine(canvas, itemPtr, display, drawable, x, y, width, height) } linewidth = linePtr->outline.width; if (((TkCanvas *)canvas)->currentItemPtr == itemPtr) { - if (linePtr->outline.activeStipple != None) { - stipple = linePtr->outline.activeStipple; - } if (linePtr->outline.activeWidth != linewidth) { linewidth = linePtr->outline.activeWidth; } } else if (state==TK_STATE_DISABLED) { - if (linePtr->outline.disabledStipple != None) { - stipple = linePtr->outline.disabledStipple; - } if (linePtr->outline.disabledWidth != linewidth) { linewidth = linePtr->outline.disabledWidth; } diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 6532868..ef977bb 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextDisp.c,v 1.42 2004/06/07 16:23:52 vincentdarley Exp $ + * RCS: @(#) $Id: tkTextDisp.c,v 1.43 2004/06/08 20:28:19 dgp Exp $ */ #include "tkPort.h" @@ -6120,7 +6120,6 @@ DlineXOfIndex(textPtr, dlPtr, byteIndex) * coordinate. */ { register TkTextDispChunk *chunkPtr = dlPtr->chunkPtr; - TkTextIndex index; int x; if (byteIndex == 0 || chunkPtr == NULL) return 0; @@ -6130,7 +6129,6 @@ DlineXOfIndex(textPtr, dlPtr, byteIndex) * the desired byte index. */ - index = dlPtr->index; chunkPtr = dlPtr->chunkPtr; while (byteIndex > 0) { if (byteIndex < chunkPtr->numBytes) { diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index c96dd9b..74f6459 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.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: tkUnixMenu.c,v 1.10 2004/05/03 23:23:14 hobbs Exp $ + * RCS: @(#) $Id: tkUnixMenu.c,v 1.11 2004/06/08 20:28:19 dgp Exp $ */ #include "tkPort.h" @@ -586,12 +586,11 @@ DrawMenuEntryIndicator(menuPtr, mePtr, d, border, indicatorColor, disableColor, */ if ((mePtr->type == CHECK_BUTTON_ENTRY) && mePtr->indicatorOn) { - int dim, top, left; + int top, left; int activeBorderWidth; int disabled = (mePtr->state == ENTRY_DISABLED); XColor *bg; - dim = (int) mePtr->platformEntryData; Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr, &activeBorderWidth); bg = Tk_3DBorderColor(border); @@ -609,12 +608,11 @@ DrawMenuEntryIndicator(menuPtr, mePtr, d, border, indicatorColor, disableColor, */ if ((mePtr->type == RADIO_BUTTON_ENTRY) && mePtr->indicatorOn) { - int dim, top, left; + int top, left; int activeBorderWidth; int disabled = (mePtr->state == ENTRY_DISABLED); XColor *bg; - dim = (int) mePtr->platformEntryData; Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr, &activeBorderWidth); bg = Tk_3DBorderColor(border); |