summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tkMenu.c9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 36608aa..af715b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-17 Joe English <jenglish@users.sourceforge.net>
+
+ * 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]).
+
2010-02-16 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tkUnixWm.c make TkSetTransientFor static
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 7af304e..122b33a 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.41.2.4 2010/01/05 09:44:54 dkf Exp $
+ * RCS: @(#) $Id: tkMenu.c,v 1.41.2.5 2010/02/17 20:58:01 jenglish Exp $
*/
/*
@@ -395,7 +395,8 @@ static Tk_ClassProcs menuClass = {
static void
FreeOptionTables(
- ClientData clientData)
+ ClientData clientData,
+ Tcl_Interp *interp)
{
ckfree(clientData);
}
@@ -423,8 +424,8 @@ TkCreateMenuCmd(
optionTablesPtr->entryOptionTables[CHECK_BUTTON_ENTRY] =
Tk_CreateOptionTable(interp, specsArray[CHECK_BUTTON_ENTRY]);
- Tcl_CreateObjCommand(interp, "menu", MenuCmd,
- (ClientData) optionTablesPtr, FreeOptionTables);
+ Tcl_CreateObjCommand(interp, "menu", MenuCmd, optionTablesPtr, 0);
+ Tcl_CallWhenDeleted(interp, FreeOptionTables, optionTablesPtr);
if (Tcl_IsSafe(interp)) {
Tcl_HideCommand(interp, "menu", "menu");