diff options
| author | jenglish@flightlab.com <jenglish> | 2010-02-17 20:58:32 (GMT) |
|---|---|---|
| committer | jenglish@flightlab.com <jenglish> | 2010-02-17 20:58:32 (GMT) |
| commit | 6bcb4466def89c192b69372d3515de0c52d6fe1a (patch) | |
| tree | 8214c2258844d5803a70a46f356c4710bd0687d5 /generic | |
| parent | 8f9bf32cb294a6d0516eded282e88dc7fad4584f (diff) | |
| download | tk-6bcb4466def89c192b69372d3515de0c52d6fe1a.zip tk-6bcb4466def89c192b69372d3515de0c52d6fe1a.tar.gz tk-6bcb4466def89c192b69372d3515de0c52d6fe1a.tar.bz2 | |
generic/tkMenu.c: Defer TkMenuOptionTables cleanup to CallWhenDeleted() time,
to ensure that the record doesn't get freed until after all widget
instance commands have been deleted (Fixes [Bug#2952745]).
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMenu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 8da4cb7..f044370 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.58 2010/01/18 20:43:38 nijtmans Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.59 2010/02/17 20:58:32 jenglish Exp $ */ /* @@ -398,7 +398,8 @@ static const Tk_ClassProcs menuClass = { static void FreeOptionTables( - ClientData clientData) + ClientData clientData, + Tcl_Interp *interp) { ckfree(clientData); } @@ -426,8 +427,8 @@ TkCreateMenuCmd( optionTablesPtr->entryOptionTables[CHECK_BUTTON_ENTRY] = Tk_CreateOptionTable(interp, specsArray[CHECK_BUTTON_ENTRY]); - Tcl_CreateObjCommand(interp, "menu", MenuCmd, optionTablesPtr, - FreeOptionTables); + Tcl_CreateObjCommand(interp, "menu", MenuCmd, optionTablesPtr, 0); + Tcl_CallWhenDeleted(interp, FreeOptionTables, optionTablesPtr); if (Tcl_IsSafe(interp)) { Tcl_HideCommand(interp, "menu", "menu"); |