diff options
| author | ericm <ericm> | 2000-05-16 17:57:32 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-05-16 17:57:32 (GMT) |
| commit | 2adfe2dab62fa99750852c0a35ff3dbedb810adc (patch) | |
| tree | 034b8394a01af37532f099931d0291df8deda1aa | |
| parent | e9b9a30379c418aef68b46cc176290488638ee09 (diff) | |
| download | tk-2adfe2dab62fa99750852c0a35ff3dbedb810adc.zip tk-2adfe2dab62fa99750852c0a35ff3dbedb810adc.tar.gz tk-2adfe2dab62fa99750852c0a35ff3dbedb810adc.tar.bz2 | |
* win/tkWinMenu.c (ReconfigureWindowsMenu): Added code to add the
MF_SEPARATOR bit for SEPARATOR_ENTRY menu items. This causes
separator entries on the system menu to be drawn correctly [Bug: 5451].
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 16 |
2 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2000-05-16 Eric Melski <ericm@scriptics.com> + + * win/tkWinMenu.c (ReconfigureWindowsMenu): Added code to add the + MF_SEPARATOR bit for SEPARATOR_ENTRY menu items. This causes + separator entries on the system menu to be drawn correctly [Bug: 5451]. + 2000-05-15 Eric Melski <ericm@scriptics.com> * doc/image.n: Added documentation for [image inuse] command. diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 61784c6..de622f9 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.9 2000/05/10 00:09:40 ericm Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.10 2000/05/16 17:57:32 ericm Exp $ */ #define OEMRESOURCE @@ -579,7 +579,7 @@ ReconfigureWindowsMenu( lpNewItem = (LPCTSTR) mePtr; flags |= MF_OWNERDRAW; } - + /* * Set enabling and disabling correctly. */ @@ -598,6 +598,18 @@ ReconfigureWindowsMenu( flags |= MF_CHECKED; } + /* + * Set the SEPARATOR bit for separator entries. This bit is not + * used by our internal drawing functions, but it is used by the + * system when drawing the system menu (we do not draw the system menu + * ourselves). If this bit is not set, separator entries on the system + * menu will not be drawn correctly. + */ + + if (mePtr->type == SEPARATOR_ENTRY) { + flags |= MF_SEPARATOR; + } + if (mePtr->columnBreak) { flags |= MF_MENUBREAK; } |