[cairo-commit] goocanvas/demo demo.c,1.24,1.25

[Damon Chaplin]

Committed by: damon

Update of /cvs/cairo/goocanvas/demo
In directory kemper:/tmp/cvs-serv1094/demo

Modified Files:
	demo.c 
Log Message:
2007-03-28  Damon Chaplin  <damon at gnome.org>

	* src/goocanvasstyle.c (goo_canvas_style_set_fill_options): check if
	the fill pattern is set to NULL, which is used to reset any fill
	pattern or color. If it is, don't set the cairo source and return
	FALSE.

	* demo/demo.c (move_ellipse_clicked): set the fill pattern to NULL
	occasionally to test the above.



Index: demo.c
===================================================================
RCS file: /cvs/cairo/goocanvas/demo/demo.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- demo.c	27 Mar 2007 11:40:56 -0000	1.24
+++ demo.c	28 Mar 2007 10:06:43 -0000	1.25
@@ -170,7 +170,7 @@
 		    "center-y", 150.0,
 		    "radius-x", 45.0,
 		    "radius-y", 40.0,
-		    "fill-color", "brown",
+		    "fill-pattern", NULL,
 		    "stroke-color", "midnightblue",
 		    "line-width", 4.0,
 		    "title", "A brown ellipse",
@@ -730,6 +730,7 @@
 
   item = goo_canvas_rect_new (root, 10, 80, 70, 60,
 			      "fill-color", "steelblue",
+			      /*"fill-pattern", NULL,*/
 			      NULL);
   setup_item_signals (item);