diff options
| author | stanton <stanton> | 1999-03-10 07:04:38 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-03-10 07:04:38 (GMT) |
| commit | 50950accea8a4e877651105374865cb6f3f48d6e (patch) | |
| tree | b83515b886272ee3c61631f31cfe3fad937dc0a7 /generic/tkImgPhoto.c | |
| parent | d6904011d50a34d15964b94db8d5e7010e081ffd (diff) | |
| download | tk-50950accea8a4e877651105374865cb6f3f48d6e.zip tk-50950accea8a4e877651105374865cb6f3f48d6e.tar.gz tk-50950accea8a4e877651105374865cb6f3f48d6e.tar.bz2 | |
integrated stubs into 8.0 main branch
Diffstat (limited to 'generic/tkImgPhoto.c')
| -rw-r--r-- | generic/tkImgPhoto.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 6ae07f6..285f1df 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.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: tkImgPhoto.c,v 1.4 1999/02/04 21:43:14 stanton Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.5 1999/03/10 07:04:39 stanton Exp $ */ #include "tkInt.h" @@ -19,6 +19,10 @@ #include "tclMath.h" #include <ctype.h> +#ifdef __WIN32__ +#include "tkWinInt.h" +#endif + /* * Declaration for internal Xlib function used here: */ @@ -121,6 +125,9 @@ typedef struct ColorTable { * MAP_COLORS: 1 means pixel values should be mapped * through pixelMap. */ +#ifdef COLOR_WINDOW +#undef COLOR_WINDOW +#endif #define BLACK_AND_WHITE 1 #define COLOR_WINDOW 2 |