summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora_kovalenko <a_kovalenko>2003-12-16 19:53:33 (GMT)
committera_kovalenko <a_kovalenko>2003-12-16 19:53:33 (GMT)
commit9e81fd48c2f4243a0e8554a10b541af90a28767d (patch)
tree80dc527a4fed6a3a07b7300177b988f787548f6c
parent78b8d3dd8e739b162a7abeda77b0fd46b9d9d2ca (diff)
downloadtk-9e81fd48c2f4243a0e8554a10b541af90a28767d.zip
tk-9e81fd48c2f4243a0e8554a10b541af90a28767d.tar.gz
tk-9e81fd48c2f4243a0e8554a10b541af90a28767d.tar.bz2
Check for TK_ALREADY_DEAD to avoid handling of dead windows.
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinWm.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b20757e..9ad1b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-16 Anton Kovalenko <a_kovalenko@users.sourceforge.net>
+
+ * win/tkWinWm.c (InstallColormaps): Check for TK_ALREADY_DEAD
+ to avoid handling of dead windows.
+
2003-12-15 David Gravereaux <davygrvy@pobox.com>
Some silent invalid handle issues discovered with NuMega's
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index e92198c..303ebd2 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.58 2003/12/16 03:29:12 davygrvy Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.59 2003/12/16 19:53:33 a_kovalenko Exp $
*/
#include "tkWinInt.h"
@@ -6407,7 +6407,7 @@ InstallColormaps(hwnd, message, isForemost)
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
- if (winPtr == NULL) {
+ if (winPtr == NULL || (winPtr->flags & TK_ALREADY_DEAD) ) {
return 0;
}