[evolution/rendering-cleanup: 8/63] gnome-canvas: Remove stipple properties from GnomeCanvasLine

[Benjamin Otte <otte src gnome org>]

commit f3d38382e26d688f5868689f75c9100f2c090eae
Author: Benjamin Otte <otte redhat com>
Date:   Fri Oct 8 16:15:15 2010 +0200

    gnome-canvas: Remove stipple properties from GnomeCanvasLine

 libgnomecanvas/gnome-canvas-line.c |   44 ------------------------------------
 libgnomecanvas/gnome-canvas-line.h |    3 --
 2 files changed, 0 insertions(+), 47 deletions(-)
---
diff --git a/libgnomecanvas/gnome-canvas-line.c b/libgnomecanvas/gnome-canvas-line.c
index c862a1f..a1e2784 100644
--- a/libgnomecanvas/gnome-canvas-line.c
+++ b/libgnomecanvas/gnome-canvas-line.c
@@ -67,7 +67,6 @@ enum {
 	PROP_FILL_COLOR,
 	PROP_FILL_COLOR_GDK,
 	PROP_FILL_COLOR_RGBA,
-	PROP_FILL_STIPPLE,
 	PROP_WIDTH_PIXELS,
 	PROP_WIDTH_UNITS,
 	PROP_CAP_STYLE,
@@ -171,12 +170,6 @@ gnome_canvas_line_class_init (GnomeCanvasLineClass *class)
 				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
         g_object_class_install_property
                 (gobject_class,
-                 PROP_FILL_STIPPLE,
-                 g_param_spec_object ("fill_stipple", NULL, NULL,
-                                      GDK_TYPE_DRAWABLE,
-                                      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-        g_object_class_install_property
-                (gobject_class,
                  PROP_WIDTH_PIXELS,
                  g_param_spec_uint ("width_pixels", NULL, NULL,
 				    0, G_MAXUINT, 0,
@@ -297,10 +290,6 @@ gnome_canvas_line_destroy (GnomeCanvasItem *object)
 		g_free (line->last_coords);
 	line->last_coords = NULL;
 
-	if (line->stipple)
-		g_object_unref (line->stipple);
-	line->stipple = NULL;
-
 	if (line->fill_svp)
 		art_svp_free (line->fill_svp);
 	line->fill_svp = NULL;
@@ -606,26 +595,6 @@ set_line_gc_width (GnomeCanvasLine *line)
 				    line->join);
 }
 
-/* Sets the stipple pattern for the line */
-static void
-set_stipple (GnomeCanvasLine *line, GdkBitmap *stipple, gint reconfigure)
-{
-	if (line->stipple && !reconfigure)
-		g_object_unref (line->stipple);
-
-	line->stipple = stipple;
-	if (stipple && !reconfigure)
-		g_object_ref (stipple);
-
-	if (line->gc) {
-		if (stipple) {
-			gdk_gc_set_stipple (line->gc, stipple);
-			gdk_gc_set_fill (line->gc, GDK_STIPPLED);
-		} else
-			gdk_gc_set_fill (line->gc, GDK_SOLID);
-	}
-}
-
 static void
 gnome_canvas_line_set_property (GObject              *object,
 				guint                 param_id,
@@ -718,11 +687,6 @@ gnome_canvas_line_set_property (GObject              *object,
 		color_changed = TRUE;
 		break;
 
-	case PROP_FILL_STIPPLE:
-		set_stipple (line, (GdkBitmap *) g_value_get_object (value), FALSE);
-		gnome_canvas_item_request_redraw_svp (item, line->fill_svp);
-		break;
-
 	case PROP_WIDTH_PIXELS:
 		line->width = g_value_get_uint (value);
 		line->width_pixels = TRUE;
@@ -893,10 +857,6 @@ gnome_canvas_line_get_property (GObject              *object,
 		g_value_set_uint (value, line->fill_rgba);
 		break;
 
-	case PROP_FILL_STIPPLE:
-		g_value_set_object (value, line->stipple);
-		break;
-
 	case PROP_WIDTH_PIXELS:
 		g_value_set_uint (value, line->width);
 		break;
@@ -966,7 +926,6 @@ gnome_canvas_line_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_p
 
         set_line_gc_foreground (line);
         set_line_gc_width (line);
-        set_stipple (line, line->stipple, TRUE);
 
         get_bounds_canvas (line, &x1, &y1, &x2, &y2, affine);
         gnome_canvas_update_bbox (item, x1, y1, x2, y2);
@@ -1082,9 +1041,6 @@ gnome_canvas_line_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	item_to_canvas (item->canvas, line->coords, points, line->num_points,
 			&actual_num_points_drawn, i2c, x, y);
 
-	if (line->stipple)
-		gnome_canvas_set_stipple_origin (item->canvas, line->gc);
-
 	gdk_draw_lines (drawable, line->gc, points, actual_num_points_drawn);
 
 	if (points != static_points)
diff --git a/libgnomecanvas/gnome-canvas-line.h b/libgnomecanvas/gnome-canvas-line.h
index f2a53c4..5dbeecd 100644
--- a/libgnomecanvas/gnome-canvas-line.h
+++ b/libgnomecanvas/gnome-canvas-line.h
@@ -58,7 +58,6 @@ G_BEGIN_DECLS
  *								the odd indices.
  * fill_color		string			W		X color specification for line
  * fill_color_gdk	GdkColor*		RW		Pointer to an allocated GdkColor
- * fill_stipple		GdkBitmap*		RW		Stipple pattern for the line
  * width_pixels		uint			R		Width of the line in pixels.  The line width
  *								will not be scaled when the canvas zoom factor changes.
  * width_units		gdouble			R		Width of the line in canvas units.  The line width
@@ -104,8 +103,6 @@ struct _GnomeCanvasLine {
 
 	GdkGC *gc;		/* GC for drawing line */
 
-	GdkBitmap *stipple;	/* Stipple pattern */
-
         ArtSVP *fill_svp;		/* The SVP for the outline shape */ /*AA*/
 	ArtSVP *first_svp;		/* The SVP for the first arrow */ /*AA*/
 	ArtSVP *last_svp;		/* The SVP for the last arrow */ /*AA*/