diff options
| author | dkf <dkf@noemail.net> | 2009-05-03 06:48:55 (GMT) |
|---|---|---|
| committer | dkf <dkf@noemail.net> | 2009-05-03 06:48:55 (GMT) |
| commit | 0ebfb95716af2b04019a989e764152fc67670d87 (patch) | |
| tree | ac5cbde1108929f0baf8ef8d65224140adad35cd | |
| parent | ec62780ab74f2071cd3b227ae58b53acd18fe307 (diff) | |
| download | tk-0ebfb95716af2b04019a989e764152fc67670d87.zip tk-0ebfb95716af2b04019a989e764152fc67670d87.tar.gz tk-0ebfb95716af2b04019a989e764152fc67670d87.tar.bz2 | |
Fix [Bug 2785744].
FossilOrigin-Name: d55d9d57e0640a8d1c225f6348d754d1c60640de
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win/tkWinWm.c | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -1,6 +1,11 @@ +2009-05-03 Donal K. Fellows <dkf@users.sf.net> + + * win/tkWinWm.c (UpdateWrapper): [Bug 2785744]: Manipulate flag bit + correctly so that menubar updates can't smash other attributes. + 2009-04-30 Pat Thoyts <patthoyts@users.sourceforge.net> - * 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 <dkf@users.sf.net> 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; } |