diff options
| author | culler <culler> | 2019-04-06 20:06:26 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-04-06 20:06:26 (GMT) |
| commit | 735733f4486f003380329dab135b932ce9c8b24f (patch) | |
| tree | 79770d3e00496cbf4b26451ef2905792615d12c8 | |
| parent | f86e6f1667a038b6c3119f4a033b798a280ae0e5 (diff) | |
| download | tk-735733f4486f003380329dab135b932ce9c8b24f.zip tk-735733f4486f003380329dab135b932ce9c8b24f.tar.gz tk-735733f4486f003380329dab135b932ce9c8b24f.tar.bz2 | |
Rename Tk_GetGeomMaster to TkGetGeomMaster and remove extraneous call to
Unlink in tkPack.c.
| -rw-r--r-- | generic/tkGrid.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkPack.c | 3 | ||||
| -rw-r--r-- | generic/tkPlace.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 81fb4f7..4e0882a 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -3357,7 +3357,7 @@ ConfigureSlaves( */ for (master = (TkWindow *)masterPtr->tkwin; master != NULL; - master = (TkWindow *)Tk_GetGeomMaster(master)) { + master = (TkWindow *)TkGetGeomMaster(master)) { if (master == (TkWindow *)slave) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put %s inside %s, would cause management loop", diff --git a/generic/tkInt.h b/generic/tkInt.h index d77c7a9..df0f645 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -323,7 +323,7 @@ typedef struct TkDisplay { * by that master. */ int geomInit; -#define Tk_GetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ +#define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) /* diff --git a/generic/tkPack.c b/generic/tkPack.c index 9ffcf45..9005d7f 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -1804,13 +1804,12 @@ ConfigureSlaves( */ for (master = (TkWindow *)masterPtr->tkwin; master != NULL; - master = (TkWindow *)Tk_GetGeomMaster(master)) { + master = (TkWindow *)TkGetGeomMaster(master)) { if (master == (TkWindow *)slave) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put %s inside %s, would cause management loop", Tcl_GetString(objv[j]), Tk_PathName(masterPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL); - Unlink(slavePtr); return TCL_ERROR; } } diff --git a/generic/tkPlace.c b/generic/tkPlace.c index 28f94c0..1a52114 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -701,7 +701,7 @@ ConfigureSlave( */ for (master = (TkWindow *)tkwin; master != NULL; - master = (TkWindow *)Tk_GetGeomMaster(master)) { + master = (TkWindow *)TkGetGeomMaster(master)) { if (master == (TkWindow *)slavePtr->tkwin) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put %s inside %s, would cause management loop", |