diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 21:04:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 21:04:47 (GMT) |
| commit | 6543fa41fa55392ee287df3d24888f2662bb7b8d (patch) | |
| tree | 063bedd2c23caf56c700b120451a3e5f80fe1def /win/tkWinDraw.c | |
| parent | 344dce41c2bb55fa7708a2257500ab98ef51829e (diff) | |
| parent | 2b6251c4c824d5477da8fa35609508dde84084f7 (diff) | |
| download | tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.zip tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.gz tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/tkWinDraw.c')
| -rw-r--r-- | win/tkWinDraw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index f770f15..dd482bd 100644 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.c @@ -23,7 +23,7 @@ * Translation table between X gc functions and Win32 raster op modes. */ -int tkpWinRopModes[] = { +const int tkpWinRopModes[] = { R2_BLACK, /* GXclear */ R2_MASKPEN, /* GXand */ R2_MASKPENNOT, /* GXandReverse */ @@ -54,7 +54,7 @@ int tkpWinRopModes[] = { #define SRCORREVERSE (DWORD)0x00DD0228 /* dest = source OR (NOT dest) */ #define SRCNAND (DWORD)0x007700E6 /* dest = NOT (source AND dest) */ -int tkpWinBltModes[] = { +const int tkpWinBltModes[] = { BLACKNESS, /* GXclear */ SRCAND, /* GXand */ SRCERASE, /* GXandReverse */ @@ -92,9 +92,10 @@ int tkpWinBltModes[] = { /* * Macros used later in the file. */ - -#define MIN(a,b) ((a>b) ? b : a) -#define MAX(a,b) ((a<b) ? b : a) +#ifndef MIN +# define MIN(a,b) ((a>b) ? b : a) +# define MAX(a,b) ((a<b) ? b : a) +#endif /* * The followng typedef is used to pass Windows GDI drawing functions. |