summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-11-12 00:05:12 (GMT)
committerhobbs <hobbs>2003-11-12 00:05:12 (GMT)
commit62397c286ba9f643a43b403afee53647389b4429 (patch)
tree7c356234e548f6e289d1f962cf4f223db8f8e677 /generic
parent945271515ead5b592c10eb661258f8c61b351b9a (diff)
downloadtk-62397c286ba9f643a43b403afee53647389b4429.zip
tk-62397c286ba9f643a43b403afee53647389b4429.tar.gz
tk-62397c286ba9f643a43b403afee53647389b4429.tar.bz2
* generic/tkButton.c (ConfigureButton): abort option processing if
the button was deleted. [Bug #824479]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkButton.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 7e629cb..a26249d 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.20.2.1 2003/04/26 02:53:46 hobbs Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.20.2.2 2003/11/12 00:05:13 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