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/tkTextWind.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/tkTextWind.c')
| -rw-r--r-- | generic/tkTextWind.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index c43b8e8..6466f68 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextWind.c,v 1.4 1999/12/14 06:52:33 hobbs Exp $ + * RCS: @(#) $Id: tkTextWind.c,v 1.5 2002/06/14 22:25:12 jenglish Exp $ */ #include "tk.h" @@ -370,7 +370,7 @@ EmbWinConfigure(textPtr, ewPtr, argc, argv) if (ancestor == parent) { break; } - if (Tk_IsTopLevel(ancestor)) { + if (Tk_TopWinHierarchy(ancestor)) { badMaster: Tcl_AppendResult(textPtr->interp, "can't embed ", Tk_PathName(ewPtr->body.ew.tkwin), " in ", @@ -379,7 +379,7 @@ EmbWinConfigure(textPtr, ewPtr, argc, argv) return TCL_ERROR; } } - if (Tk_IsTopLevel(ewPtr->body.ew.tkwin) + if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin) || (ewPtr->body.ew.tkwin == textPtr->tkwin)) { goto badMaster; } @@ -790,7 +790,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars, if (ancestor == Tk_Parent(ewPtr->body.ew.tkwin)) { break; } - if (Tk_IsTopLevel(ancestor)) { + if (Tk_TopWinHierarchy(ancestor)) { badMaster: Tcl_AppendResult(textPtr->interp, "can't embed ", Tk_PathName(ewPtr->body.ew.tkwin), " relative to ", @@ -800,7 +800,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars, goto gotWindow; } } - if (Tk_IsTopLevel(ewPtr->body.ew.tkwin) + if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin) || (textPtr->tkwin == ewPtr->body.ew.tkwin)) { goto badMaster; } |