gnumeric r17010 - in trunk: . src

[emmanuel svn gnome org]

Author: emmanuel
Date: Sat Dec 13 20:11:35 2008
New Revision: 17010
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17010&view=rev

Log:
2008-12-13  Emmanuel Pacaud <emmanuel gnome org>

	Add a workaround for the murrine theme warnings.

	* src/item-bar.c (ib_draw_cell): here.
	* src/sheet-control-gui.c (cb_select_all_btn_expose): here.

Modified:
   trunk/ChangeLog
   trunk/src/item-bar.c
   trunk/src/sheet-control-gui.c

Modified: trunk/src/item-bar.c
==============================================================================
--- trunk/src/item-bar.c	(original)
+++ trunk/src/item-bar.c	Sat Dec 13 20:11:35 2008
@@ -298,8 +298,11 @@
 
 	gdk_draw_rectangle (drawable, gc, TRUE,
 		rect->x + 1, rect->y + 1, rect->width - 1, rect->height - 1);
+
+	/* The widget parameters could be NULL, but if so some themes would emit a warning.
+	 * (Murrine is known to do this: http://bugzilla.gnome.org/show_bug.cgi?id=564410). */
 	gtk_paint_shadow (canvas->style, drawable, GTK_STATE_NORMAL, shadow,
-			  NULL, NULL, "GnmItemBarCell",
+			  NULL, canvas, "GnmItemBarCell",
 			  rect->x, rect->y, rect->width + 1, rect->height + 1);
 
 	g_return_if_fail (font != NULL);

Modified: trunk/src/sheet-control-gui.c
==============================================================================
--- trunk/src/sheet-control-gui.c	(original)
+++ trunk/src/sheet-control-gui.c	Sat Dec 13 20:11:35 2008
@@ -600,8 +600,10 @@
 			    widget->style->bg_gc[GTK_STATE_ACTIVE],
 			    TRUE,
 			    offset + 1, 1, widget->allocation.width - 1, widget->allocation.height - 1);
+	/* The widget parameters could be NULL, but if so some themes would emit a warning.
+	 * (Murrine is known to do this: http://bugzilla.gnome.org/show_bug.cgi?id=564410). */
 	gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-			  NULL, NULL, "GnmItemBarCell",
+			  NULL, widget, "GnmItemBarCell",
 			  offset, 0, widget->allocation.width + 1, widget->allocation.height + 1);
 }