From 76b4c4fbcc6b88ff944aeebde12226acdfd5efd1 Mon Sep 17 00:00:00 2001 From: "donal.k.fellows@manchester.ac.uk" Date: Sun, 3 May 2009 06:48:55 +0000 Subject: Fix [Bug 2785744]. --- ChangeLog | 7 ++++++- win/tkWinWm.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1608ea..55507c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2009-05-03 Donal K. Fellows + + * win/tkWinWm.c (UpdateWrapper): [Bug 2785744]: Manipulate flag bit + correctly so that menubar updates can't smash other attributes. + 2009-04-30 Pat Thoyts - * win/tkWinWm.c: [Patch 2504402] backported change to create + * win/tkWinWm.c: [Patch 2504402]: Backported change to create wm icons as device independent bitmaps. (cjmcdonald) 2009-04-30 Donal K. Fellows diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 6901a80..b18318f 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.124.2.4 2009/04/30 15:06:57 patthoyts Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.124.2.5 2009/05/03 06:48:55 dkf Exp $ */ #include "tkWinInt.h" @@ -2353,7 +2353,7 @@ UpdateWrapper( */ if (wmPtr->hMenu != NULL) { - wmPtr->flags = WM_SYNC_PENDING; + wmPtr->flags |= WM_SYNC_PENDING; SetMenu(wmPtr->wrapper, wmPtr->hMenu); wmPtr->flags &= ~WM_SYNC_PENDING; } -- cgit v0.12