diff options
| author | davygrvy <davygrvy> | 2004-10-27 00:37:37 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-10-27 00:37:37 (GMT) |
| commit | d33aaf2b8fa569171d30a455a154d803d2ecb5c6 (patch) | |
| tree | b983c1273c1a6326de84746006f8e4f502466cdb /generic/tkMenu.c | |
| parent | 5272d0523a6a8fba692f9407882c5d159db3c3ff (diff) | |
| download | tk-d33aaf2b8fa569171d30a455a154d803d2ecb5c6.zip tk-d33aaf2b8fa569171d30a455a154d803d2ecb5c6.tar.gz tk-d33aaf2b8fa569171d30a455a154d803d2ecb5c6.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:
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index a2f791a..ac6ae3e 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.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: tkMenu.c,v 1.20.2.3 2004/09/16 20:05:44 hobbs Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.20.2.4 2004/10/27 00:37:38 davygrvy Exp $ */ /* @@ -370,7 +370,7 @@ static void MenuWorldChanged _ANSI_ARGS_(( static int PostProcessEntry _ANSI_ARGS_((TkMenuEntry *mePtr)); static void RecursivelyDeleteMenu _ANSI_ARGS_((TkMenu *menuPtr)); static void UnhookCascadeEntry _ANSI_ARGS_((TkMenuEntry *mePtr)); -static void TkMenuCleanup _ANSI_ARGS_((ClientData unused)); +static Tcl_ExitProc TkMenuCleanup; /* * The structure below is a list of procs that respond to certain window @@ -3594,7 +3594,7 @@ TkMenuInit() /* * Make sure we cleanup on finalize. */ - Tcl_CreateExitHandler((Tcl_ExitProc *) TkMenuCleanup, NULL); + TkCreateExitHandler(TkMenuCleanup, NULL); Tcl_MutexUnlock(&menuMutex); } if (!tsdPtr->menusInitialized) { |