summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwordtech <wordtech>2011-01-14 23:43:10 (GMT)
committerwordtech <wordtech>2011-01-14 23:43:10 (GMT)
commit29da300289c4ffb2b9758648859f06a8151cbb3a (patch)
tree78a4a60e37e55bc0813baf4303a5ca924e80b3df
parentda17b64cd4c2f564a53d71ee4ff1377756655510 (diff)
downloadtk-29da300289c4ffb2b9758648859f06a8151cbb3a.zip
tk-29da300289c4ffb2b9758648859f06a8151cbb3a.tar.gz
tk-29da300289c4ffb2b9758648859f06a8151cbb3a.tar.bz2
Remove stippling from disabled images under Aqua; renders as white box currently.
-rw-r--r--generic/ttk/ttkLabel.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index 3f1d7c7..6a8c23f 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -1,4 +1,4 @@
-/* $Id: ttkLabel.c,v 1.13 2010/01/22 14:17:53 nijtmans Exp $
+/* $Id: ttkLabel.c,v 1.14 2011/01/14 23:43:10 wordtech Exp $
*
* text, image, and label elements.
*
@@ -326,10 +326,16 @@ static void ImageDraw(
* stipple the image.
* @@@ Possibly: Don't do disabled-stippling at all;
* @@@ it's ugly and out of fashion.
+ * Do not stipple at all under Aqua, just draw the image: it shows up
+ * as a white rectangle otherwise.
*/
+
+
if (state & TTK_STATE_DISABLED) {
if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
+ #ifndef MAC_OSX_TK
StippleOver(image, tkwin, d, b.x,b.y);
+ #endif
}
}
}