summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-27 17:08:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-27 17:08:11 (GMT)
commited9cf42792f8332d1386414e459c9a4af9c66238 (patch)
tree24f6406655c0f69f4defd52000bba323ec167b93 /generic/tkInt.h
parent4636816c13f9e6a6889fe871f54c0a17151e6513 (diff)
parent09cadff7abbce69fb5d07b88b20f6461a05a0541 (diff)
downloadtk-ed9cf42792f8332d1386414e459c9a4af9c66238.zip
tk-ed9cf42792f8332d1386414e459c9a4af9c66238.tar.gz
tk-ed9cf42792f8332d1386414e459c9a4af9c66238.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index a5e98c0..10fa4e2 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -374,7 +374,7 @@ typedef struct TkDisplay {
* by that container. */
int geomInit;
-#define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
+#define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr)
/*