From cfa2caa8be76ffed4179c1f51779095c837cab14 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 4 May 2004 00:39:45 +0000
Subject: 	* unix/tkUnixButton.c (TkpDrawCheckIndicator): allow
 radiobuttons 	to be drawn when disabledforeground and/or selectcolor are
 NULL. 	[Bug #826850] (griffin)

---
 ChangeLog           |  4 ++++
 unix/tkUnixButton.c | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc0d81e..970233b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-03  Jeff Hobbs  <jeffh@ActiveState.com>
 
+	* unix/tkUnixButton.c (TkpDrawCheckIndicator): allow radiobuttons
+	to be drawn when disabledforeground and/or selectcolor are NULL.
+	[Bug #826850] (griffin)
+
 	* win/tkWinMenu.c, unix/tkUnixMenu.c (DrawMenuEntryLabel): place
 	images of compound menu entries in indicator space if not a radio
 	of checkbutton. [Bug #756952] (eserte)
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 4f9e8dc..526f70b 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.18 2004/03/16 19:55:12 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixButton.c,v 1.19 2004/05/04 00:39:51 hobbs Exp $
  */
 
 #include "tkButton.h"
@@ -165,11 +165,18 @@ TkpDrawCheckIndicator(tkwin, display, d, x, y, bgBorder, indicatorColor,
      */
 
     if (tkwin == NULL || display == None || d == None || bgBorder == NULL
-	    || indicatorColor == NULL || selectColor == NULL
-	    || disableColor == NULL) {
+	    || indicatorColor == NULL) {
 	return;
     }
 
+    if (disableColor == NULL) {
+	disableColor = bg_brdr->bgColorPtr;
+    }
+
+    if (selectColor == NULL) {
+	selectColor = bg_brdr->bgColorPtr;
+    }
+
     depth = Tk_Depth(tkwin);
 
     /*
@@ -249,8 +256,6 @@ TkpDrawCheckIndicator(tkwin, display, d, x, y, bgBorder, indicatorColor,
 	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);
-- 
cgit v0.12