diff options
| author | hobbs <hobbs> | 2006-04-05 20:59:03 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-04-05 20:59:03 (GMT) |
| commit | ab42886ce05e488745fb43f8f5056b8e4b66de32 (patch) | |
| tree | 14d83611bf96b4a9c3456f524916408958611045 /generic/tkMenu.c | |
| parent | 1f65ac0a258750a79d6a26ee8ee181cc7c4efd86 (diff) | |
| download | tk-ab42886ce05e488745fb43f8f5056b8e4b66de32.zip tk-ab42886ce05e488745fb43f8f5056b8e4b66de32.tar.gz tk-ab42886ce05e488745fb43f8f5056b8e4b66de32.tar.bz2 | |
* generic/tkMenu.c (TkSetWindowMenuBar): remove extra TkMenuInit
call that caused finalization panic. [Bug 1456851]
* win/tkWinMenu.c (FreeID, TkpNewMenu, MenuExitHandler)
(MenuThreadExitHandler, TkpMenuInit, TkpMenuThreadInit): rework
Windows menu init/finalization to better respect per-process and
per-thread boundaries. [Bug 1456851]
(TkWinMenuKeyObjCmd): Do not error when unknown window is passed
in. [Bug 1236306]
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 8f55f45..37644a4 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.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: tkMenu.c,v 1.34 2005/11/27 02:36:14 das Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.35 2006/04/05 20:59:03 hobbs Exp $ */ /* @@ -3072,22 +3072,11 @@ TkSetWindowMenuBar( * toplevel needs to be set to. NULL means * that their is no menu now. */ { - TkWindow *winPtr = (TkWindow *)tkwin; TkMenuTopLevelList *topLevelListPtr, *prevTopLevelPtr; TkMenu *menuPtr; TkMenuReferences *menuRefPtr; /* - * Avoid reinitialization if we are just cleaning up dead windows. - * Perhaps knowing when Tcl was really exiting would be better than just - * checking for this winPtr being dead. [Bug 749908] - */ - - if (!(winPtr->flags & TK_ALREADY_DEAD)) { - TkMenuInit(); - } - - /* * Destroy the menubar instances of the old menu. Take this window out of * the old menu's top level reference list. */ |