summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-08-08 09:35:33 (GMT)
committerhobbs <hobbs>2002-08-08 09:35:33 (GMT)
commit2a483654f2d457a6fe7c945a20dd912d7f2809d7 (patch)
treeff9e1d0c90347d11da220d724196c137e23102a0 /generic
parent159f654513f91b42512e97502bee98ca23472936 (diff)
downloadtk-2a483654f2d457a6fe7c945a20dd912d7f2809d7.zip
tk-2a483654f2d457a6fe7c945a20dd912d7f2809d7.tar.gz
tk-2a483654f2d457a6fe7c945a20dd912d7f2809d7.tar.bz2
* generic/tkButton.c (TkButtonWorldChanged): added GCFont handling
to the disabledGc of buttons when compound != none. The drawing appears to be incorrect across platforms still. [Bug #477740]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkButton.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 141f69f..07e226b 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkButton.c,v 1.19 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.20 2002/08/08 09:35:34 hobbs Exp $
*/
#include "tkButton.h"
@@ -1348,6 +1348,9 @@ TkButtonWorldChanged(instanceData)
} else {
gcValues.foreground = gcValues.background;
mask = GCForeground;
+ if (butPtr->compound != COMPOUND_NONE) {
+ mask |= GCFont;
+ }
if (butPtr->gray == None) {
butPtr->gray = Tk_GetBitmap(NULL, butPtr->tkwin, "gray50");
}