summaryrefslogtreecommitdiffstats
path: root/generic/tkImgPhoto.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-08 06:25:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-08 06:25:09 (GMT)
commit3b31d9630f305b2f6b73e57e147541bc13aa1057 (patch)
tree9e87a5fc11cedd72b8337bf57a660307be55557d /generic/tkImgPhoto.h
parentdc2c36cea500db6933ade16c3252cef0a66ab26d (diff)
downloadtk-3b31d9630f305b2f6b73e57e147541bc13aa1057.zip
tk-3b31d9630f305b2f6b73e57e147541bc13aa1057.tar.gz
tk-3b31d9630f305b2f6b73e57e147541bc13aa1057.tar.bz2
TIP #581: master -> container and slave -> content in ttk (mainly)
Diffstat (limited to 'generic/tkImgPhoto.h')
-rw-r--r--generic/tkImgPhoto.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h
index 9cd4195..994fa40 100644
--- a/generic/tkImgPhoto.h
+++ b/generic/tkImgPhoto.h
@@ -138,7 +138,7 @@ 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 {
@@ -165,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. */
};
/*
@@ -196,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. */