summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2004-05-15 04:07:15 (GMT)
committerchengyemao <chengyemao>2004-05-15 04:07:15 (GMT)
commit77906eb14a3e5489b402712eb8cb1d6ccdc1e8ad (patch)
tree996a87b17bcb621910b6c25d38feab7525cc2c6f
parent8c77a45120b2bbaa5354a2b6c7f8833c89e489d7 (diff)
downloadtk-77906eb14a3e5489b402712eb8cb1d6ccdc1e8ad.zip
tk-77906eb14a3e5489b402712eb8cb1d6ccdc1e8ad.tar.gz
tk-77906eb14a3e5489b402712eb8cb1d6ccdc1e8ad.tar.bz2
Modified UpdateWrapper to fix 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 792daf7..861f235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-14 Chengye Mao <chengye.geo@yahoo.com>
+ * win/tkWinWm.c <UpdateWrapper> Modified to delete the old wrapper
+ correctly [Bug #767176]
+
2004-05-14 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* library/msgbox.tcl (MessageBox): Shrank the default font size
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 69a4bd5..d4fdec9 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.54 2002/12/06 23:29:37 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.1 2004/05/15 04:07:15 chengyemao Exp $
*/
#include "tkWinInt.h"
@@ -1803,7 +1803,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;
@@ -1944,7 +1944,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);