diff options
| author | tmh <tmh> | 2001-10-12 13:30:31 (GMT) |
|---|---|---|
| committer | tmh <tmh> | 2001-10-12 13:30:31 (GMT) |
| commit | 343a12a735abd601b4cd5c087be337a51851adb6 (patch) | |
| tree | f0a41bc451b44d520db4074ba5b826c8c8d8b723 /win/tkWinWm.c | |
| parent | 93e8dfc4adffc6846037794671ceec5d52fda96c (diff) | |
| download | tk-343a12a735abd601b4cd5c087be337a51851adb6.zip tk-343a12a735abd601b4cd5c087be337a51851adb6.tar.gz tk-343a12a735abd601b4cd5c087be337a51851adb6.tar.bz2 | |
implementation of TIP 63 (accepted) -compound option to menu items.macosx_8_4_branchpoint
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 421c139..b2041c5 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.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: tkWinWm.c,v 1.30 2001/09/21 20:38:35 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.31 2001/10/12 13:30:32 tmh Exp $ */ #include "tkWinInt.h" @@ -766,7 +766,7 @@ InitWm(void) * *---------------------------------------------------------------------- */ -int +static int WinSetIcon(interp, titlebaricon, tkw) Tcl_Interp *interp; WinIconPtr titlebaricon; @@ -1091,10 +1091,12 @@ BlockOfIconImagesPtr ReadIconFromICOFile(Tcl_Interp* interp, char* fileName){ } if (Tcl_SetChannelOption(interp, channel, "-translation", "binary") != TCL_OK) { + Tcl_Close(NULL, channel); return NULL; } if (Tcl_SetChannelOption(interp, channel, "-encoding", "binary") != TCL_OK) { + Tcl_Close(NULL, channel); return NULL; } /* Allocate memory for the resource structure */ |