diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-10-20 23:08:39 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-10-20 23:08:39 (GMT) |
| commit | 03880fd134adfb470ff24cf0af43d7e45ae56530 (patch) | |
| tree | f4cea4f1bce37df61bf97a6c05638d35e8eb6558 /generic/tkImgPhoto.h | |
| parent | 0a018d6ac1df162044309966c31de5f0941ebf27 (diff) | |
| parent | 38f526f519657d58703e013e4415a7e4788ec33f (diff) | |
| download | tk-03880fd134adfb470ff24cf0af43d7e45ae56530.zip tk-03880fd134adfb470ff24cf0af43d7e45ae56530.tar.gz tk-03880fd134adfb470ff24cf0af43d7e45ae56530.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tkImgPhoto.h')
| -rw-r--r-- | generic/tkImgPhoto.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h index 36bc6cb..a84ebb3 100644 --- a/generic/tkImgPhoto.h +++ b/generic/tkImgPhoto.h @@ -93,10 +93,17 @@ struct ColorTableId { struct ColorTable { ColorTableId id; /* Information used in selecting this color * table. */ +#if TCL_MAJOR_VERSION > 8 + size_t refCount; /* Number of instances using this map. */ + size_t liveRefCount; /* Number of instances which are actually in + * use, using this map. */ + int flags; /* See below. */ +#else int flags; /* See below. */ - int refCount; /* Number of instances using this map. */ - int liveRefCount; /* Number of instances which are actually in + unsigned int refCount; /* Number of instances using this map. */ + unsigned int liveRefCount; /* Number of instances which are actually in * use, using this map. */ +#endif int numColors; /* Number of colors allocated for this map. */ XVisualInfo visualInfo; /* Information about the visual for windows @@ -201,7 +208,11 @@ struct PhotoInstance { * this particular colormap. */ PhotoInstance *nextPtr; /* Pointer to the next instance in the list of * instances associated with this master. */ - int refCount; /* Number of instances using this structure. */ +#if TCL_MAJOR_VERSION > 8 + size_t refCount; /* Number of instances using this structure. */ +#else + unsigned int refCount; /* Number of instances using this structure. */ +#endif Tk_Uid palette; /* Palette for these particular instances. */ double gamma; /* Gamma value for these instances. */ Tk_Uid defaultPalette; /* Default palette to use if a palette is not |