diff options
| author | jenglish <jenglish@flightlab.com> | 2002-06-14 22:25:11 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2002-06-14 22:25:11 (GMT) |
| commit | 15879fe51346c8d78ce33c47a6c22755852add70 (patch) | |
| tree | db4f9b64945413c671514dd1b7f254700c3649cb /generic/tkPack.c | |
| parent | ad91e4c59c306ee78b3351f9c60fd3d39755f106 (diff) | |
| download | tk-15879fe51346c8d78ce33c47a6c22755852add70.zip tk-15879fe51346c8d78ce33c47a6c22755852add70.tar.gz tk-15879fe51346c8d78ce33c47a6c22755852add70.tar.bz2 | |
TIP #47 "Modifying Tk to Allow Writing X Window managers"
(patch from Neil McKay).
* Add CirculateRequest, Create, MapRequest, ResizeRequest,
and ConfigureRequest event types;
* Split TK_TOPLEVEL flag into TK_TOPLEVEL, TK_HAS_WRAPPER,
TK_WIN_MANAGED, and TK_TOP_HIERARCHY.
Diffstat (limited to 'generic/tkPack.c')
| -rw-r--r-- | generic/tkPack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkPack.c b/generic/tkPack.c index 8033b7b..607af25 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPack.c,v 1.15 2002/01/17 05:13:11 dgp Exp $ + * RCS: @(#) $Id: tkPack.c,v 1.16 2002/06/14 22:25:12 jenglish Exp $ */ #include "tkPort.h" @@ -1190,7 +1190,7 @@ PackAfter(interp, prevPtr, masterPtr, objc, objv) if (ancestor == parent) { break; } - if (((Tk_FakeWin *) (ancestor))->flags & TK_TOP_LEVEL) { + if (((Tk_FakeWin *) (ancestor))->flags & TK_TOP_HIERARCHY) { badWindow: Tcl_AppendResult(interp, "can't pack ", Tcl_GetString(objv[0]), " inside ", Tk_PathName(masterPtr->tkwin), @@ -1198,7 +1198,7 @@ PackAfter(interp, prevPtr, masterPtr, objc, objv) return TCL_ERROR; } } - if (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_LEVEL) { + if (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) { goto badWindow; } if (tkwin == masterPtr->tkwin) { @@ -1589,7 +1589,7 @@ ConfigureSlaves(interp, tkwin, objc, objv) if (TkGetWindowFromObj(interp, tkwin, objv[j], &slave) != TCL_OK) { return TCL_ERROR; } - if (Tk_IsTopLevel(slave)) { + if (Tk_TopWinHierarchy(slave)) { Tcl_AppendResult(interp, "can't pack \"", Tcl_GetString(objv[j]), "\": it's a top-level window", (char *) NULL); return TCL_ERROR; @@ -1795,7 +1795,7 @@ ConfigureSlaves(interp, tkwin, objc, objv) if (ancestor == parent) { break; } - if (Tk_IsTopLevel(ancestor)) { + if (Tk_TopWinHierarchy(ancestor)) { Tcl_AppendResult(interp, "can't pack ", Tcl_GetString(objv[j]), " inside ", Tk_PathName(masterPtr->tkwin), (char *) NULL); |