From 459cac7ed25678462be3072d2b7047b512d49a4c Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Wed, 12 Nov 2003 00:07:42 +0000
Subject: * generic/tkButton.c (ConfigureButton): abort option
processing if the button was deleted. [Bug #824479]
---
ChangeLog | 9 +++++++++
generic/tkButton.c | 9 ++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index fbe7d29..db0984e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,19 @@
2003-11-11 Jeff Hobbs <jeffh@ActiveState.com>
+ * generic/tkButton.c (ConfigureButton): abort option processing if
+ the button was deleted. [Bug #824479]
+
+ * generic/tkMenuDraw.c (TkPostSubmenu): add {} around menu name in
+ case it has spaces when calling Tcl_VarEval. This is a hack until
+ this is rewritten for proper Tcl_Obj handling. [Bug #723856]
+
* library/tkfbox.tcl (::tk::dialog::file::Update): optimize the
dir/files list separation by using the -tails, -directory and
-type option of 'glob'. Also passes the glob the -filetypes
filters instead of calling string match over each file.
[Patch #833819]
+ (::tk::dialog::file::ActivateEnt): allow typing filename into
+ entry when tk_getOpenFile -multiple 1 is specified. [Bug #788069]
* generic/tkListbox.c (ListboxDeleteSubCmd, ListboxListVarProc):
free itemconfig data when removing it from table. [Bug #836483]
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 640921f..bfd5010 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkButton.c,v 1.21 2003/04/26 02:59:20 hobbs Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.22 2003/11/12 00:07:42 hobbs Exp $
*/
#include "tkButton.h"
@@ -1080,6 +1080,13 @@ ConfigureButton(interp, butPtr, objc, objv)
Tk_RestoreSavedOptions(&savedOptions);
}
+ if ((butPtr->flags & BUTTON_DELETED)) {
+ /*
+ * Somehow button was deleted - just abort now. [Bug #824479]
+ */
+ return TCL_ERROR;
+ }
+
/*
* A few options need special processing, such as setting the
* background from a 3-D border, or filling in complicated
--
cgit v0.12