summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2009-12-27 23:36:24 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2009-12-27 23:36:24 (GMT)
commit13dfb9e00306c6d37b855ff603417c623e1d50f8 (patch)
tree4274d0a52b38d43b2349c0b604545b5deb501e16
parentae3c94f919c49e57d8be6cea52c0eeb4a72ab398 (diff)
downloadtk-13dfb9e00306c6d37b855ff603417c623e1d50f8.zip
tk-13dfb9e00306c6d37b855ff603417c623e1d50f8.tar.gz
tk-13dfb9e00306c6d37b855ff603417c623e1d50f8.tar.bz2
Highlight for cascade items in torn-off menus is incorrect on Windows.
Applied patch from [Bug 2879927].
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinMenu.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f314bd8..cc65f9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-27 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/tkWinMenu.c: Highlight for cascade items in torn-off menus
+ is incorrect on Windows. Applied patch from [Bug 2879927].
+
2009-12-25 Joe English <jenglish@users.sourceforge.net>
* library/ttk/utils.tcl, library/notebook.tcl:
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index d597a16..6b85e6d 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -10,7 +10,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.69 2009/09/14 23:41:42 hobbs Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.70 2009/12/27 23:36:25 patthoyts Exp $
*/
#define OEMRESOURCE
@@ -1812,8 +1812,10 @@ DrawMenuEntryArrow(
gc->background = activeBgColor->pixel;
}
- gc->foreground = GetSysColor((mePtr->state == ENTRY_DISABLED) ?
- COLOR_GRAYTEXT : COLOR_MENUTEXT);
+ gc->foreground = GetSysColor((mePtr->state == ENTRY_DISABLED)
+ ? COLOR_GRAYTEXT
+ : ((mePtr->state == ENTRY_ACTIVE)
+ ? COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT));
rect.top = y + GetSystemMetrics(SM_CYBORDER);
rect.bottom = y + height - GetSystemMetrics(SM_CYBORDER);