diff options
| author | dgp <dgp@noemail.net> | 2008-12-09 21:22:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2008-12-09 21:22:54 (GMT) |
| commit | 04941c46fb7522d90294249a460cdc286311339c (patch) | |
| tree | e39ebc39fa16df5aad460109866ff73b8cbf2df6 /unix | |
| parent | b9f13f543c36609021016a48ed8aadcf6227ee40 (diff) | |
| download | tk-04941c46fb7522d90294249a460cdc286311339c.zip tk-04941c46fb7522d90294249a460cdc286311339c.tar.gz tk-04941c46fb7522d90294249a460cdc286311339c.tar.bz2 | |
TIP 337
* generic/tkBind.c: Updated callers of Tcl_BackgroundError()
* generic/tkCanvas.c: to use the new routine
* generic/tkEntry.c: Tcl_BackgroundException() as appropriate.
* generic/tkImgBmap.c:
* generic/tkListbox.c:
* generic/tkSelect.c:
* generic/tkTextDisp.c:
* generic/tkTextWind.c:
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXWindowEvent.c:
* unix/tkUnixScale.c:
* unix/tkUnixWm.c:
* win/tkWinButton.c:
* win/tkWinMenu.c:
* win/tkWinScrlbr.c:
* win/tkWinWm.c:
FossilOrigin-Name: 8390c9df2a3de24d02b3414ba3ef502bc1349814
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixScale.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index 4c925b7..fd249ba 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixScale.c,v 1.13 2007/12/13 15:28:51 dgp Exp $ + * RCS: @(#) $Id: tkUnixScale.c,v 1.14 2008/12/09 21:22:56 dgp Exp $ */ #include "tkInt.h" @@ -557,7 +557,7 @@ TkpDisplayScale( (char *) NULL); if (result != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (command executed by scale)"); - Tcl_BackgroundError(interp); + Tcl_BackgroundException(interp, result); } Tcl_Release((ClientData) interp); } diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 1b9cbdf..0e0ceea 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.66 2008/11/18 23:49:43 nijtmans Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.67 2008/12/09 21:22:56 dgp Exp $ */ #include "tkUnixInt.h" @@ -6086,11 +6086,10 @@ TkWmProtocolEventProc( Tcl_Preserve((ClientData) interp); result = Tcl_GlobalEval(interp, protPtr->command); if (result != TCL_OK) { - Tcl_AddErrorInfo(interp, "\n (command for \""); - Tcl_AddErrorInfo(interp, protocolName); - Tcl_AddErrorInfo(interp, - "\" window manager protocol)"); - Tcl_BackgroundError(interp); + Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( + "\n (command for \"%s\" window manager protocol)", + protocolName)); + Tcl_BackgroundException(interp, result); } Tcl_Release((ClientData) interp); Tcl_Release((ClientData) protPtr); |