diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-09 11:50:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-09 11:50:19 (GMT) |
| commit | aff38ee930b8b62b99c03fd79c2fb03f8f27c85f (patch) | |
| tree | 77d59773feece114c78cae0e5d0095f3a8c6bdea /generic | |
| parent | f12a8565b7dec286dead34e157892fed3202f352 (diff) | |
| parent | b33639f20e412831ed8724517ba70b2cdab6be57 (diff) | |
| download | tk-aff38ee930b8b62b99c03fd79c2fb03f8f27c85f.zip tk-aff38ee930b8b62b99c03fd79c2fb03f8f27c85f.tar.gz tk-aff38ee930b8b62b99c03fd79c2fb03f8f27c85f.tar.bz2 | |
merge trunkjn_web_colors
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkLabel.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 9fd2f69..706f444 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -29,10 +29,10 @@ # endif #endif +#include "tkInt.h" #include <ctype.h> #include <stdio.h> #include <string.h> -#include "tkInt.h" #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index 17433dc..5102baf 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -351,9 +351,9 @@ static void ImageDraw( if (state & TTK_STATE_DISABLED) { if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) { - #ifndef MAC_OSX_TK +#ifndef MAC_OSX_TK StippleOver(image, tkwin, d, b.x,b.y); - #endif +#endif } } } |