From f94d62aeab94c6ddffbffef5e4e7d563383a5b50 Mon Sep 17 00:00:00 2001 From: Steffen Macke Date: Sat, 6 Feb 2010 20:04:30 +0200 Subject: [PATCH] Fix menu bar problem in ms-windows theme engine on Windows 7 Patch from bug #591186. It won't have any effect in this branch as the whole XP-and-later theming code is broken and disabled, but when/if that is fixed, then this patch should help. --- modules/engines/ms-windows/msw_style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index c430204034..a7e1e63b43 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -698,8 +698,8 @@ setup_msw_rc_style (void) GdkColor text_prelight; /* Prelight */ - sys_color_to_gtk_color (XP_THEME_CLASS_TEXT, - get_windows_version () == VISTA_VERSION ? COLOR_MENUTEXT : COLOR_HIGHLIGHTTEXT, + sys_color_to_gtk_color (get_windows_version () >= VISTA_VERSION ? XP_THEME_CLASS_MENU : XP_THEME_CLASS_TEXT, + get_windows_version () >= VISTA_VERSION ? COLOR_MENUTEXT : COLOR_HIGHLIGHTTEXT, &fg_prelight); sys_color_to_gtk_color (XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHT, &bg_prelight); sys_color_to_gtk_color (XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHT,