summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--generic/tkButton.c5
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f570c0..568e69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-08 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * 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]
+
+ * generic/tkImgGIF.c (FileReadGIF): fixed -from handling for gifs
+ [Bug #467524] (obermeier)
+
2002-08-07 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tkCanvUtil.c (TkSmoothParseProc): recognize the built-in
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");
}