Import Tk 8.6.11
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
* Forward declarations of the structures we define.
|
||||
*/
|
||||
|
||||
#define PhotoModel PhotoMaster
|
||||
typedef struct ColorTableId ColorTableId;
|
||||
typedef struct ColorTable ColorTable;
|
||||
typedef struct PhotoInstance PhotoInstance;
|
||||
@@ -137,11 +138,11 @@ struct ColorTable {
|
||||
#define MAP_COLORS 8
|
||||
|
||||
/*
|
||||
* Definition of the data associated with each photo image master.
|
||||
* Definition of the data associated with each photo image model.
|
||||
*/
|
||||
|
||||
struct PhotoMaster {
|
||||
Tk_ImageMaster tkMaster; /* Tk's token for image master. NULL means the
|
||||
Tk_ImageMaster tkMaster; /* Tk's token for image model. NULL means the
|
||||
* image is being deleted. */
|
||||
Tcl_Interp *interp; /* Interpreter associated with the application
|
||||
* using this image. */
|
||||
@@ -164,7 +165,7 @@ struct PhotoMaster {
|
||||
TkRegion validRegion; /* Tk region indicating which parts of the
|
||||
* image have valid image data. */
|
||||
PhotoInstance *instancePtr; /* First in the list of instances associated
|
||||
* with this master. */
|
||||
* with this model. */
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -195,17 +196,17 @@ struct PhotoMaster {
|
||||
*/
|
||||
|
||||
struct PhotoInstance {
|
||||
PhotoMaster *masterPtr; /* Pointer to master for image. */
|
||||
PhotoMaster *masterPtr; /* Pointer to model for image. */
|
||||
Display *display; /* Display for windows using this instance. */
|
||||
Colormap colormap; /* The image may only be used in windows with
|
||||
* this particular colormap. */
|
||||
PhotoInstance *nextPtr; /* Pointer to the next instance in the list of
|
||||
* instances associated with this master. */
|
||||
* instances associated with this model. */
|
||||
int refCount; /* Number of instances using this structure. */
|
||||
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
|
||||
* specified for the master. */
|
||||
* specified for the model. */
|
||||
ColorTable *colorTablePtr; /* Pointer to information about colors
|
||||
* allocated for image display in windows like
|
||||
* this one. */
|
||||
|
||||
Reference in New Issue
Block a user