diff options
| author | hobbs <hobbs@noemail.net> | 2005-01-04 01:29:12 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2005-01-04 01:29:12 (GMT) |
| commit | dc4a202d8deaa0226d4f524dec0c4b5b02f4753c (patch) | |
| tree | 259e50ecc205c0730059825b521b3cb96b419a7f | |
| parent | aeb8c31746c20007bb530a25449b4afaac31229a (diff) | |
| download | tk-dc4a202d8deaa0226d4f524dec0c4b5b02f4753c.zip tk-dc4a202d8deaa0226d4f524dec0c4b5b02f4753c.tar.gz tk-dc4a202d8deaa0226d4f524dec0c4b5b02f4753c.tar.bz2 | |
* win/tkWinWm.c (TkWinWmCleanup): clean up layered window class.
This caused crash in reinit of Tk (as seen in plugin).
FossilOrigin-Name: fb16796c0619bb227e890df58de0128080fd974b
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/tkWinWm.c | 13 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-01-03 Jeff Hobbs <jeffh@ActiveState.com> + + * win/tkWinWm.c (TkWinWmCleanup): clean up layered window class. + This caused crash in reinit of Tk (as seen in plugin). + 2004-12-29 Jeff Hobbs <jeffh@ActiveState.com> * win/tcl.m4, win/configure: update MSVC CFLAGS_OPT to -O2, remove diff --git a/win/tkWinWm.c b/win/tkWinWm.c index e9263ab..82795b4 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.85 2004/12/28 08:45:31 chengyemao Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.86 2005/01/04 01:29:12 hobbs Exp $ */ #include "tkWinInt.h" @@ -1838,6 +1838,15 @@ TkWinWmCleanup(hInstance) tsdPtr->initialized = 0; UnregisterClass(TK_WIN_TOPLEVEL_CLASS_NAME, hInstance); +#ifndef TCL_THREADS + /* + * Clean up specialized class created for layered windows. + */ + if (setLayeredWindowAttributesProc != NULL) { + UnregisterClass(TK_WIN_TOPLEVEL_NOCDC_CLASS_NAME, hInstance); + setLayeredWindowAttributesProc = NULL; + } +#endif } /* @@ -7882,4 +7891,4 @@ long TkpWinToplevelOverrideRedirect(winPtr, reqValue) } } return reqValue; -}
\ No newline at end of file +} |