Merge from themes-2. See the ChangeLog for a somewhat detailed

history of the evolution of the changes involved. Most of this
is actually minor painting tweaks.

1 files changed, 2 insertions, 16 deletions

diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index c6cb6d6b2b..482bcdd85d 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -227,7 +227,6 @@ gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
   GtkWidget *widget;
   GtkStateType state_type;
   GtkShadowType shadow_type;
-  GdkPoint pts[4];
   gint width, height;
   gint x, y;
 
@@ -244,8 +243,6 @@ gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
 	   widget->style->klass->xthickness + 2);
       y = (widget->allocation.height - height) / 2;
 
-      gdk_window_clear_area (widget->window, x, y, width, height);
-
       if (check_menu_item->active ||
 	  check_menu_item->always_show_toggle ||
 	  (GTK_WIDGET_STATE (check_menu_item) == GTK_STATE_PRELIGHT))
@@ -257,20 +254,9 @@ gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
 	  else
 	    shadow_type = GTK_SHADOW_OUT;
 
-	  pts[0].x = x + width / 2;
-	  pts[0].y = y;
-	  pts[1].x = x + width;
-	  pts[1].y = y + height / 2;
-	  pts[2].x = pts[0].x;
-	  pts[2].y = y + height;
-	  pts[3].x = x;
-	  pts[3].y = pts[1].y;
-
-	  gdk_draw_polygon (widget->window,
-			    widget->style->bg_gc[state_type],
-			    TRUE, pts, 4);
-	  gtk_draw_diamond (widget->style, widget->window,
+	  gtk_paint_option (widget->style, widget->window,
 			    state_type, shadow_type,
+			    area, widget, "option",
 			    x, y, width, height);
 	}
     }