summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2004-05-08 03:53:57 (GMT)
committerchengyemao <chengyemao>2004-05-08 03:53:57 (GMT)
commitf7960709322830225bdd51fc1d89cb6b15d980db (patch)
treeb61ba940150644ddf4f6796d3473bd5aad03004e
parent70ad1209cb16fa978aab64c10f31729084d003db (diff)
downloadtk-f7960709322830225bdd51fc1d89cb6b15d980db.zip
tk-f7960709322830225bdd51fc1d89cb6b15d980db.tar.gz
tk-f7960709322830225bdd51fc1d89cb6b15d980db.tar.bz2
Fixed bug 767176
-rw-r--r--ChangeLog4
-rw-r--r--win/tkWinWm.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d2ce61..12dd906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-07 Chengye Mao <chengye.geo@yahoo.com>
+ * win/tkWinWm.c <UpdateWrapper>: handle and destroy old wrapper
+ correctly and fix crash problem in wish exiting [Bug 767176].
+
2004-05-05 Jeff Hobbs <jeffh@ActiveState.com>
* win/tkWinFont.c (FindSubFontForChar): corrections to dkf patch
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index e555484..86f2073 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.60 2004/01/13 02:06:02 davygrvy Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.61 2004/05/08 03:53:57 chengyemao Exp $
*/
#include "tkWinInt.h"
@@ -1805,7 +1805,7 @@ UpdateWrapper(winPtr)
TkWindow *winPtr; /* Top-level window to redecorate. */
{
register WmInfo *wmPtr = winPtr->wmInfoPtr;
- HWND parentHWND, oldWrapper;
+ HWND parentHWND, oldWrapper = wmPtr->wrapper;
HWND child;
int x, y, width, height, state;
WINDOWPLACEMENT place;
@@ -1946,7 +1946,7 @@ UpdateWrapper(winPtr)
SetWindowLong(child, GWL_WNDPROC, (LONG) TopLevelProc);
#endif
}
- oldWrapper = SetParent(child, wmPtr->wrapper);
+ SetParent(child, wmPtr->wrapper);
if (oldWrapper) {
hSmallIcon = (HICON) SendMessage(oldWrapper, WM_GETICON, ICON_SMALL,
(LPARAM) NULL);