summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tkWindow.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 033dcdc..831bf61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-24 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * generic/tkWindow.c: permit wm manage of any widget (esp: ttk::frame)
+
2007-10-23 Jeff Hobbs <jeffh@ActiveState.com>
* library/ttk/combobox.tcl (ttk::combobox::PopdownWindow): redo wm
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index d9da81a..c2e12f8 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.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: tkWindow.c,v 1.86 2007/09/17 14:58:05 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.87 2007/10/24 00:16:43 patthoyts Exp $
*/
#include "tkInt.h"
@@ -1706,7 +1706,7 @@ Tk_MakeWindowExist(
}
createProc = Tk_GetClassProc(winPtr->classProcsPtr, createProc);
- if (createProc != NULL) {
+ if (createProc != NULL && parent != None) {
winPtr->window = (*createProc)(tkwin, parent, winPtr->instanceData);
} else {
winPtr->window = TkpMakeWindow(winPtr, parent);