From 2adfe2dab62fa99750852c0a35ff3dbedb810adc Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Tue, 16 May 2000 17:57:32 +0000
Subject: * 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].

---
 ChangeLog       |  6 ++++++
 win/tkWinMenu.c | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f17c0a..09cc513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
 	}
-- 
cgit v0.12