diff options
| author | hobbs <hobbs> | 2002-12-06 23:29:37 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-12-06 23:29:37 (GMT) |
| commit | df50e6eb7fcee1b7b60c7dc9c0d1968124197b9e (patch) | |
| tree | 5929fe9f8d605ca8e874bea4a8c835657cd5367d /win/tkWinWm.c | |
| parent | 2be80c2ee9e0835f69dbc4773498a020c025bd0c (diff) | |
| download | tk-df50e6eb7fcee1b7b60c7dc9c0d1968124197b9e.zip tk-df50e6eb7fcee1b7b60c7dc9c0d1968124197b9e.tar.gz tk-df50e6eb7fcee1b7b60c7dc9c0d1968124197b9e.tar.bz2 | |
* win/tkWinX.c (TkWinXInit): Move cleanup into an exit handler
* win/tkWin32Dll.c (DllMain): to ensure that it will be called
* win/tkWinWm.c (TkWinWmCleanup): without having to unload the dll.
Also reset the static int initialized on cleanup to allow reinit.
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 8442881..69a4bd5 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.53 2002/12/01 23:37:54 mdejong Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.54 2002/12/06 23:29:37 hobbs Exp $ */ #include "tkWinInt.h" @@ -1680,6 +1680,11 @@ TkWinWmCleanup(hInstance) } #endif + if (!initialized) { + return; + } + initialized = 0; + tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); |