From cb47788d27fef553413682249bf62e618f3ae4a6 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 19 Apr 2007 17:24:57 +0000 Subject: [PATCH] Fix menuitem rendering in Vista svn path=/trunk/; revision=17614 --- ChangeLog | 5 +++++ modules/engines/ms-windows/msw_style.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c2a15e780..01ffbb5d6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-19 Cody Russell + + * modules/engines/ms-windows/msw_style.c: Fix menuitem rendering + for Windows Vista. (#392015, Hiroyuki Yamamoto) + 2007-04-19 Dominic Lachowicz * modules/engines/ms-windows/msw_style.c: Fix pixbuf leaks in diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index bb149d86f1..51a9e2e367 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -1717,13 +1717,9 @@ draw_menu_item(GdkWindow* window, GtkWidget* widget, GtkStyle* style, HDC dc; RECT rect; - if ( xp_theme_is_active() ) { - return xp_theme_draw( window, XP_THEME_ELEMENT_MENU_ITEM, style, - x, y, width, height, state_type, area ); - } - if( (parent = gtk_widget_get_parent(widget)) - && GTK_IS_MENU_BAR(parent) ) + && GTK_IS_MENU_BAR(parent) + && !xp_theme_is_active() ) { bar = GTK_MENU_SHELL(parent);