X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simpleline.c;h=efff5034f95f4ca7070b8b337dec98e8404aca99;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=6d583128558953c1681017ea2c0f895b0c6f43d8;hpb=a06c33b6d91ea9ef8f3970a6027ffdf6f267d0b3;p=ardour.git

diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
index 6d58312855..efff5034f9 100644
--- a/gtk2_ardour/canvas-simpleline.c
+++ b/gtk2_ardour/canvas-simpleline.c
@@ -177,13 +177,9 @@ gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline)
 static void
 gnome_canvas_simpleline_destroy (GtkObject *object)
 {
-	GnomeCanvasSimpleLine *line;
-
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
 
-	line = GNOME_CANVAS_SIMPLELINE (object);
-
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -223,7 +219,7 @@ gnome_canvas_simpleline_set_property (GObject      *object,
 	case PROP_Y1:
                 d = g_value_get_double (value);
 	        if (simpleline->y1 != d) {
-		        simpleline->y1 = d; 
+		        simpleline->y1 = d;
 			bounds_changed = TRUE;
 		}
 		break;
@@ -310,7 +306,7 @@ gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *c
 
         /* get current bounding box in parent-relative world coordinates */
 
-        gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); 
+        gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2);
 
         /* convert parent-relative item coordinates to world coordinates */
 
@@ -325,7 +321,7 @@ gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *c
         y2 = ceil (y2);
 
         /* force non-zero dimensionality for both axes */
-        
+
         if (x1 == x2) {
                 x2 += 1.0;
         }
@@ -375,12 +371,12 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
 	x1 = simpleline->cx1;
 	x2 = simpleline->cx2;
         y1 = simpleline->cy1;
-        
+
 	if (buf->is_bg) {
 		gnome_canvas_buf_ensure_buf (buf);
 		buf->is_bg = FALSE;
 	}
-        
+
         if (simpleline->x1 != simpleline->x2) {
                 PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
                              x1, x2, y1);
@@ -388,20 +384,16 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
                 y2 = simpleline->cy2;
                 PAINT_VERTA (buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
                              x1, y1, y2);
-                
+
         }
 }
 
 static void
-gnome_canvas_simpleline_draw (GnomeCanvasItem *item,
-                              GdkDrawable *drawable,
+gnome_canvas_simpleline_draw (GnomeCanvasItem* canvas,
+                              GdkDrawable* drawable,
                               int x, int y,
                               int width, int height)
 {
-	GnomeCanvasSimpleLine *simpleline;
-
-	simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
         /* XXX not implemented */
 }
 
@@ -422,12 +414,9 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx
 	(void) cx;
 	(void) cy;
 
-	GnomeCanvasSimpleLine *simpleline;
 	double x1, y1, x2, y2;
 	double dx, dy;
 
-	simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
 	*actual_item = item;
 
 	/* Find the bounds for the line */