diff options
| author | davygrvy <davygrvy@noemail.net> | 2004-10-27 00:37:36 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@noemail.net> | 2004-10-27 00:37:36 (GMT) |
| commit | a0c94541792efc9fe5147ca2460c257a42445539 (patch) | |
| tree | b983c1273c1a6326de84746006f8e4f502466cdb /win/tkWinEmbed.c | |
| parent | 3cd73d42bf155fe9953db8705f9f3f9671479a11 (diff) | |
| download | tk-a0c94541792efc9fe5147ca2460c257a42445539.zip tk-a0c94541792efc9fe5147ca2460c257a42445539.tar.gz tk-a0c94541792efc9fe5147ca2460c257a42445539.tar.bz2 | |
* generic/tkInt.h: Backport of shutdown safety mods from the HEAD
* generic/tkMenu.c: dating from 2003-12-21
* generic/tkUtil.c:
* generic/tkWindow.c:
* mac/tkMacButton.c:
* unix/tkUnixEvent.c:
* win/tkWin32Dll.c:
* win/tkWinEmbed.c:
* win/tkWinMenu.c:
* win/tkWinX.c:
FossilOrigin-Name: 9eb5a917089fb12e1052c4ac69deda9c2a92eee5
Diffstat (limited to 'win/tkWinEmbed.c')
| -rw-r--r-- | win/tkWinEmbed.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index 990ff29..a916050 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.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: tkWinEmbed.c,v 1.7 2002/08/05 04:30:41 dgp Exp $ + * RCS: @(#) $Id: tkWinEmbed.c,v 1.7.2.1 2004/10/27 00:37:38 davygrvy Exp $ */ #include "tkWinInt.h" @@ -208,7 +208,7 @@ TkpUseWindow(interp, tkwin, string) */ if (tsdPtr->firstContainerPtr == (Container *) NULL) { - Tcl_CreateExitHandler(CleanupContainerList, (ClientData) NULL); + TkCreateExitHandler(CleanupContainerList, (ClientData) NULL); } /* @@ -284,7 +284,7 @@ TkpMakeContainer(tkwin) */ if (tsdPtr->firstContainerPtr == (Container *) NULL) { - Tcl_CreateExitHandler(CleanupContainerList, (ClientData) NULL); + TkCreateExitHandler(CleanupContainerList, (ClientData) NULL); } /* @@ -385,11 +385,13 @@ TkWinEmbeddedEventProc(hwnd, message, wParam, lParam) */ for (containerPtr = tsdPtr->firstContainerPtr; - containerPtr->parentHWnd != hwnd; + containerPtr && containerPtr->parentHWnd != hwnd; containerPtr = containerPtr->nextPtr) { - if (containerPtr == NULL) { - panic("TkWinContainerProc couldn't find Container record"); - } + /* empty loop body */ + } + + if (containerPtr == NULL) { + Tcl_Panic("TkWinContainerProc couldn't find Container record"); } switch (message) { |