summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorculler <culler>2019-04-04 17:02:00 (GMT)
committerculler <culler>2019-04-04 17:02:00 (GMT)
commit04bf6f37b10cf10187fa12370fa5ef2daccb6b15 (patch)
tree3e565ac0aac80df355d18ee2ec4cddca39d3ba45 /generic/tkInt.h
parent91172dfcd45a3cf4a60fcd083f9e96202b2adefb (diff)
downloadtk-04bf6f37b10cf10187fa12370fa5ef2daccb6b15.zip
tk-04bf6f37b10cf10187fa12370fa5ef2daccb6b15.tar.gz
tk-04bf6f37b10cf10187fa12370fa5ef2daccb6b15.tar.bz2
Rework how contrasting backgrounds are handled.
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index c50a75c..2020486 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -323,6 +323,9 @@ typedef struct TkDisplay {
* by that master. */
int geomInit;
+#define Tk_GetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
+ ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr)
+
/*
* Information used by tkGet.c only:
*/
@@ -770,7 +773,7 @@ typedef struct TkWindow {
* window. */
ClientData geomData; /* Argument for geometry manager functions. */
char *geomMgrName; /* Records the name of the geometry manager. */
- struct TkWindow *geomMasterPtr;
+ struct TkWindow *maintainerPtr;
/* The master assigned by Tk_MaintainGeometry.*/
int reqWidth, reqHeight; /* Arguments from last call to
* Tk_GeometryRequest, or 0's if