[murrine/gtk+3] Removed deprecated GtkOptionmenu

[Andrea Cimitan <acimitan src gnome org>]

commit 73bbd5c3de1836170f30b671e169e69e0e51be67
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Wed Oct 13 18:13:42 2010 +0200

    Removed deprecated GtkOptionmenu

 src/murrine_draw.c  |   29 -----------------------------
 src/murrine_style.c |   30 ------------------------------
 src/murrine_types.h |    6 ------
 3 files changed, 0 insertions(+), 65 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index eb32f0e..01e1beb 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -1051,34 +1051,6 @@ murrine_draw_combobox (cairo_t *cr,
 }
 
 static void
-murrine_draw_optionmenu (cairo_t *cr,
-                         const MurrineColors        *colors,
-                         const WidgetParameters     *widget,
-                         const OptionMenuParameters *optionmenu,
-                         int x, int y, int width, int height)
-{
-	ButtonParameters button;
-	button.has_default_button_color = FALSE;
-	int offset = widget->ythickness + 1;
-
-	boolean horizontal = TRUE;
-	if (((float)width/height<0.5) || (widget->glazestyle > 0 && width<height))
-		horizontal = FALSE;
-
-	widget->style_functions->draw_button (cr, colors, widget, &button, x, y, width, height, horizontal);
-
-	/* Draw the separator */
-	MurrineRGB *dark = (MurrineRGB*)&colors->shade[6];
-
-	cairo_translate        (cr, optionmenu->linepos+0.5, 1);
-
-	murrine_set_color_rgba (cr, dark, 0.4);
-	cairo_move_to          (cr, 0.0, offset);
-	cairo_line_to          (cr, 0.0, height - offset - widget->ythickness + 1);
-	cairo_stroke           (cr);
-}
-
-static void
 murrine_draw_menubar (cairo_t *cr,
                       const MurrineColors *colors,
                       const WidgetParameters *widget,
@@ -3670,7 +3642,6 @@ murrine_register_style_murrine (MurrineStyleFunctions *functions)
 	functions->draw_slider_handle      = murrine_draw_slider_handle;
 	functions->draw_spinbutton         = murrine_draw_spinbutton;
 	functions->draw_spinbutton_down    = murrine_draw_spinbutton_down;
-	functions->draw_optionmenu         = murrine_draw_optionmenu;
 	functions->draw_combo_separator    = murrine_draw_combo_separator;
 	functions->draw_menubar	           = murrine_draw_menubar;
 	functions->draw_tab                = murrine_draw_tab;
diff --git a/src/murrine_style.c b/src/murrine_style.c
index b69ec0f..5ec43b4 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -1268,35 +1268,6 @@ murrine_style_draw_box (DRAW_ARGS)
 			STYLE_FUNCTION(draw_slider_handle) (cr, &murrine_style->colors, &params, &handle, x, y, width, height, horizontal);
 		}
 	}
-	else if (DETAIL ("optionmenu"))
-	{
-		WidgetParameters params;
-		OptionMenuParameters optionmenu;
-
-		GtkRequisition indicator_size;
-		GtkBorder indicator_spacing;
-
-		murrine_option_menu_get_props (widget, &indicator_size, &indicator_spacing);
-
-		if (widget && murrine_get_direction (widget) == GTK_TEXT_DIR_RTL)
-			optionmenu.linepos = (indicator_size.width+indicator_spacing.left+indicator_spacing.right)+style->xthickness;
-		else
-			optionmenu.linepos = width-(indicator_size.width+indicator_spacing.left+indicator_spacing.right)-style->xthickness;
-
-		murrine_set_widget_parameters (widget, style, state_type, &params);
-
-		if (murrine_style->comboboxstyle > 0)
-		{
-			ComboBoxParameters combobox;
-			combobox.as_list = FALSE;
-			combobox.box_w = indicator_size.width+indicator_spacing.left+indicator_spacing.right+3;
-			combobox.style = murrine_style->comboboxstyle;
-			combobox.prelight_shade = murrine_style->prelight_shade;
-			STYLE_FUNCTION(draw_combobox) (cr, murrine_style->colors, params, &combobox, x, y, width, height, TRUE);
-		}
-		else
-			STYLE_FUNCTION(draw_optionmenu) (cr, colors, &params, &optionmenu, x, y, width, height);
-	}
 	else if (DETAIL ("menuitem"))
 	{
 		WidgetParameters params;
@@ -1994,7 +1965,6 @@ murrine_style_draw_layout (GtkStyle     *style,
 				    MRN_IS_COMBO_BOX(gtk_widget_get_parent (widget)) ||
 				    MRN_IS_COMBO_BOX_ENTRY(gtk_widget_get_parent (widget)) ||
 				    MRN_IS_COMBO(gtk_widget_get_parent (widget)) ||
-				    MRN_IS_OPTION_MENU(gtk_widget_get_parent (widget)) ||
 				    MRN_IS_NOTEBOOK(gtk_widget_get_parent (widget)))
 				{
 					GtkReliefStyle relief = GTK_RELIEF_NORMAL;
diff --git a/src/murrine_types.h b/src/murrine_types.h
index 4496239..9d46b02 100644
--- a/src/murrine_types.h
+++ b/src/murrine_types.h
@@ -463,12 +463,6 @@ struct _MurrineStyleFunctions
 	                              const WidgetParameters *widget,
 	                              int x, int y, int width, int height);
 
-	void (*draw_optionmenu) (cairo_t *cr,
-	                         const MurrineColors        *colors,
-	                         const WidgetParameters     *widget,
-	                         const OptionMenuParameters *optionmenu,
-	                         int x, int y, int width, int height);
-
 	void (*draw_menubar) (cairo_t *cr,
 	                      const MurrineColors    *colors,
 	                      const WidgetParameters *widget,