From 12819e574ba8306071f121cee54c2685d6d157bc Mon Sep 17 00:00:00 2001 From: hobbs Date: Tue, 16 Mar 2004 19:55:01 +0000 Subject: * unix/tkUnixButton.c (TkpDrawCheckIndicator): correct crash condition for new radio/checkbuttons when colors are exhausted. [Bug 915330] (griffin) FossilOrigin-Name: 18f5e754841df314a331a775bba78baad93aeac9 --- ChangeLog | 17 +++++++++++++++++ unix/tkUnixButton.c | 10 +++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c8d5da..3a3ab1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2004-03-16 Jeff Hobbs + + * unix/tkUnixButton.c (TkpDrawCheckIndicator): correct crash + condition for new radio/checkbuttons when colors are exhausted. + [Bug 915330] (griffin) + + * generic/tkGrid.c (GridRowColumnConfigureCommand): fix lint warning + + * generic/tkCanvUtil.c: fix cast warnings + + * generic/tkTextImage.c (EmbImageConfigure): fix casts + + * unix/tkUnixSelect.c (ConvertSelection, TkSelPropProc): fix casts + + * unix/configure, unix/tcl.m4: add -Wno-strict-aliasing for GCC to + suppress useless type puning warnings. + 2004-03-08 David Gravereaux * win/makefile.vc: diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c index ef6d866..4f9e8dc 100644 --- a/unix/tkUnixButton.c +++ b/unix/tkUnixButton.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: tkUnixButton.c,v 1.17 2004/02/18 00:40:24 hobbs Exp $ + * RCS: @(#) $Id: tkUnixButton.c,v 1.18 2004/03/16 19:55:12 hobbs Exp $ */ #include "tkButton.h" @@ -244,12 +244,16 @@ TkpDrawCheckIndicator(tkwin, display, d, x, y, bgBorder, indicatorColor, Tk_GetColorByValue(tkwin, bg_brdr->bgColorPtr)->pixel; imgColors[1 /*B*/] = Tk_GetColorByValue(tkwin, bg_brdr->bgColorPtr)->pixel; - imgColors[2 /*C*/] = - Tk_GetColorByValue(tkwin, bg_brdr->lightColorPtr)->pixel; + imgColors[2 /*C*/] = (bg_brdr->lightColorPtr != NULL) ? + Tk_GetColorByValue(tkwin, bg_brdr->lightColorPtr)->pixel : + WhitePixelOfScreen(bg_brdr->screen); imgColors[3 /*D*/] = Tk_GetColorByValue(tkwin, selectColor)->pixel; imgColors[4 /*E*/] = Tk_GetColorByValue(tkwin, bg_brdr->darkColorPtr)->pixel; + imgColors[4 /*E*/] = (bg_brdr->darkColorPtr != NULL) ? + Tk_GetColorByValue(tkwin, bg_brdr->darkColorPtr)->pixel : + BlackPixelOfScreen(bg_brdr->screen); imgColors[5 /*F*/] = Tk_GetColorByValue(tkwin, bg_brdr->bgColorPtr)->pixel; imgColors[6 /*G*/] = -- cgit v0.12