From 847e8e877858c89627b0e81bffdbcdef79c210c3 Mon Sep 17 00:00:00 2001 From: jenglish Date: Sun, 11 Jan 2009 08:40:19 +0000 Subject: ttkNotebook.c(NotebookCleanup): Don't call Tk_DeleteOptionTable(), it's unnecessary and quite possibly harmful [Bug 2496162]. --- ChangeLog | 6 ++++++ generic/ttk/ttkNotebook.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23bfce7..344098d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-11 Joe English + + * generic/ttk/ttkNotebook.c(NotebookCleanup): + Don't call Tk_DeleteOptionTable(), it's unnecessary + and quite possibly harmful [Bug 2496162]. + 2009-01-08 Jan Nijtmans * generic/tk3d.c: CONSTify TkDebugBorder diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index fe66308..08fd236 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -1,4 +1,4 @@ -/* $Id: ttkNotebook.c,v 1.16 2008/11/09 23:53:09 jenglish Exp $ +/* $Id: ttkNotebook.c,v 1.17 2009/01/11 08:40:19 jenglish Exp $ * Copyright (c) 2004, Joe English */ @@ -1239,9 +1239,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); } -- cgit v0.12