diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2008-11-15 00:00:27 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2008-11-15 00:00:27 (GMT) |
| commit | 4c0836f8ae0a1a68edf876a7bcce826b8518d658 (patch) | |
| tree | 0cd171a59f6750b740f05dea59cfa718220543b3 /unix | |
| parent | 080a0c2bef5e33ed37734a26d0647ea309cc3ea2 (diff) | |
| download | tk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.zip tk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.tar.gz tk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.tar.bz2 | |
bug 2239034: restrict [wm manage] to Frame type widgets
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixWm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 358ba0f..2218d86 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.64 2008/11/08 18:44:40 dkf Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.65 2008/11/15 00:00:27 patthoyts Exp $ */ #include "tkUnixInt.h" @@ -2660,6 +2660,12 @@ WmManageCmd( register WmInfo *wmPtr = winPtr->wmInfoPtr; if (!Tk_IsTopLevel(frameWin)) { + if (!Tk_IsManageable(frameWin)) { + Tcl_AppendResult(interp, "window \"", + Tk_PathName(frameWin), "\" is not manageable: must be " + "a frame, labelframe or toplevel", NULL); + return TCL_ERROR; + } TkFocusSplit(winPtr); Tk_UnmapWindow(frameWin); winPtr->flags |= TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED; |