diff options
Diffstat (limited to 'gtk/gtkmenuitem.c')
-rw-r--r-- | gtk/gtkmenuitem.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 823d99c420..8890a7502b 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -415,26 +415,25 @@ gtk_menu_item_paint (GtkWidget *widget, if (!GTK_WIDGET_IS_SENSITIVE (widget)) state_type = GTK_STATE_INSENSITIVE; -/* gdk_window_set_back_pixmap (widget->window, NULL, TRUE);*/ - x = GTK_CONTAINER (menu_item)->border_width; y = GTK_CONTAINER (menu_item)->border_width; width = widget->allocation.width - x * 2; height = widget->allocation.height - y * 2; - + if ((state_type == GTK_STATE_PRELIGHT) && (GTK_BIN (menu_item)->child)) - gtk_paint_box (widget->style, - widget->window, - GTK_STATE_PRELIGHT, - GTK_SHADOW_OUT, - area, widget, "menuitem", - x, y, width, height); - else + gtk_paint_box (widget->style, + widget->window, + GTK_STATE_PRELIGHT, + GTK_SHADOW_OUT, + area, widget, "menuitem", + x, y, width, height); + else { gdk_window_set_back_pixmap (widget->window, NULL, TRUE); gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height); } + if (menu_item->submenu && menu_item->show_submenu_indicator) { shadow_type = GTK_SHADOW_OUT; |