Fix menuitem rendering in Vista

svn path=/trunk/; revision=17614
This commit is contained in:
Cody Russell 2007-04-19 17:24:57 +00:00
parent 2bb4433af7
commit cb47788d27
2 changed files with 7 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2007-04-19 Cody Russell <bratsche@gnome.org>
* modules/engines/ms-windows/msw_style.c: Fix menuitem rendering
for Windows Vista. (#392015, Hiroyuki Yamamoto)
2007-04-19 Dominic Lachowicz <domlachowicz@gmail.com> 2007-04-19 Dominic Lachowicz <domlachowicz@gmail.com>
* modules/engines/ms-windows/msw_style.c: Fix pixbuf leaks in * modules/engines/ms-windows/msw_style.c: Fix pixbuf leaks in

View File

@ -1717,13 +1717,9 @@ draw_menu_item(GdkWindow* window, GtkWidget* widget, GtkStyle* style,
HDC dc; HDC dc;
RECT rect; 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)) 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); bar = GTK_MENU_SHELL(parent);