summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-03-29 05:38:13 (GMT)
committerhobbs <hobbs>2006-03-29 05:38:13 (GMT)
commit9daa69d043816ae24b0de03552135d4cbed3b061 (patch)
tree1a84d31738597066184f9a1d42af881ec6da9a4f
parentca93ccccb08898c0863cfe07d0485d07df14352e (diff)
downloadtk-9daa69d043816ae24b0de03552135d4cbed3b061.zip
tk-9daa69d043816ae24b0de03552135d4cbed3b061.tar.gz
tk-9daa69d043816ae24b0de03552135d4cbed3b061.tar.bz2
* generic/tkWindow.c (CreateTopLevelWindow): use thread exit
handler for DeleteWindowsExitProc.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkWindow.c13
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a30038f..f6c23a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkWindow.c (CreateTopLevelWindow): use thread exit
+ handler for DeleteWindowsExitProc.
+
2006-03-28 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/makefile.vc: Avoid pipe problems on win98.
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 92fa165..500aaac 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.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: tkWindow.c,v 1.56.2.6 2005/07/28 03:45:03 hobbs Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.56.2.7 2006/03/29 05:38:14 hobbs Exp $
*/
#include "tkPort.h"
@@ -344,23 +344,24 @@ CreateTopLevelWindow(interp, parent, name, screenName, flags)
/*
* Create built-in image types.
*/
-
+
Tk_CreateImageType(&tkBitmapImageType);
Tk_CreateImageType(&tkPhotoImageType);
-
+
/*
* Create built-in photo image formats.
*/
-
+
Tk_CreatePhotoImageFormat(&tkImgFmtGIF);
Tk_CreatePhotoImageFormat(&tkImgFmtPPM);
/*
* Create exit handler to delete all windows when the application
- * exits.
+ * exits. This must be a thread exit handler.
*/
- TkCreateExitHandler(DeleteWindowsExitProc, (ClientData) tsdPtr);
+ Tcl_CreateThreadExitHandler(DeleteWindowsExitProc,
+ (ClientData) tsdPtr);
}
if ((parent != NULL) && (screenName != NULL) && (screenName[0] == '\0')) {