summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/ttk/ttkNotebook.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c0111b0..9cea675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-16 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/ttk/ttkNotebook.c: Don't call Tk_DeleteOptionTable()
+ [Bug 2915709], backport fix for [Bug 2496162].
2009-12-14 Kevin B. Kenny <kennykb@acm.org>
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 68fd665..8bcee74 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1,4 +1,4 @@
-/* $Id: ttkNotebook.c,v 1.13 2008/01/28 00:36:08 jenglish Exp $
+/* $Id: ttkNotebook.c,v 1.13.2.1 2009/12/16 20:40:29 jenglish Exp $
* Copyright (c) 2004, Joe English
*/
@@ -1241,9 +1241,6 @@ static void NotebookCleanup(void *recordPtr)
Notebook *nb = recordPtr;
Ttk_DeleteManager(nb->notebook.mgr);
- Tk_DeleteOptionTable(nb->notebook.tabOptionTable);
- Tk_DeleteOptionTable(nb->notebook.paneOptionTable);
-
if (nb->notebook.tabLayout)
Ttk_FreeLayout(nb->notebook.tabLayout);
}