diff options
| author | jenglish <jenglish@flightlab.com> | 2008-11-16 17:14:16 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-11-16 17:14:16 (GMT) |
| commit | d9fafe1f52ff004f0ff69bd9c137f8ac0ffa1a85 (patch) | |
| tree | 85462e1e5bc712fd9adae557c8182937658d0205 /generic/ttk/ttkWidget.c | |
| parent | c06d8b5997ceab121a63b035b9cbe666d78bdbec (diff) | |
| download | tk-d9fafe1f52ff004f0ff69bd9c137f8ac0ffa1a85.zip tk-d9fafe1f52ff004f0ff69bd9c137f8ac0ffa1a85.tar.gz tk-d9fafe1f52ff004f0ff69bd9c137f8ac0ffa1a85.tar.bz2 | |
Widget self-destruction is not necessarily an error [Bug 2298720].
Diffstat (limited to 'generic/ttk/ttkWidget.c')
| -rw-r--r-- | generic/ttk/ttkWidget.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c index c2cb2b6..9f8e0a4 100644 --- a/generic/ttk/ttkWidget.c +++ b/generic/ttk/ttkWidget.c @@ -1,4 +1,4 @@ -/* $Id: ttkWidget.c,v 1.18 2008/11/13 01:13:54 jenglish Exp $ +/* $Id: ttkWidget.c,v 1.19 2008/11/16 17:14:16 jenglish Exp $ * Copyright (c) 2003, Joe English * * Core widget utilities. @@ -183,10 +183,6 @@ WidgetInstanceObjCmd( Tcl_Preserve(clientData); status = TtkWidgetEnsembleCommand(commands,1, interp,objc,objv,clientData); - if (WidgetDestroyed(corePtr)) { - status = TCL_ERROR; - Tcl_SetResult(interp, "Widget has been destroyed", TCL_STATIC); - } Tcl_Release(clientData); return status; @@ -664,6 +660,10 @@ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr) Tk_FreeSavedOptions(&savedOptions); status = corePtr->widgetSpec->postConfigureProc(interp,recordPtr,mask); + if (WidgetDestroyed(corePtr)) { + Tcl_SetResult(interp, "Widget has been destroyed", TCL_STATIC); + status = TCL_ERROR; + } if (status != TCL_OK) { return status; } |