summaryrefslogtreecommitdiffstats
path: root/win/tkWinWm.c
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-11-15 00:00:27 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-11-15 00:00:27 (GMT)
commit4c0836f8ae0a1a68edf876a7bcce826b8518d658 (patch)
tree0cd171a59f6750b740f05dea59cfa718220543b3 /win/tkWinWm.c
parent080a0c2bef5e33ed37734a26d0647ea309cc3ea2 (diff)
downloadtk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.zip
tk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.tar.gz
tk-4c0836f8ae0a1a68edf876a7bcce826b8518d658.tar.bz2
bug 2239034: restrict [wm manage] to Frame type widgets
Diffstat (limited to 'win/tkWinWm.c')
-rw-r--r--win/tkWinWm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 004397d..7660c04 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.131 2008/10/17 23:18:38 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.132 2008/11/15 00:00:27 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -4587,6 +4587,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;