X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simplerect.c;h=fe6e1855be03848cd092b7699c31b3032a8a3f52;hb=d883d4623ab326b921e6a26d5ea47bf609bd4a85;hp=028753ee202a90d27f86c99c52cbcf76dbaf57c4;hpb=1ae3214c0dbd8491feff0add7b445fe1ab14ecab;p=ardour.git diff --git a/gtk2_ardour/canvas-simplerect.c b/gtk2_ardour/canvas-simplerect.c index 028753ee20..fe6e1855be 100644 --- a/gtk2_ardour/canvas-simplerect.c +++ b/gtk2_ardour/canvas-simplerect.c @@ -232,13 +232,9 @@ gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect) static void gnome_canvas_simplerect_destroy (GtkObject *object) { - GnomeCanvasSimpleRect *rect; - g_return_if_fail (object != NULL); g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object)); - rect = GNOME_CANVAS_SIMPLERECT (object); - /* remember, destroy can be run multiple times! */ if (GTK_OBJECT_CLASS (parent_class)->destroy) @@ -628,23 +624,23 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, if (simplerect->outline_a > 0) { for (i = 0; i < simplerect->outline_pixels; ++i) { - + if (simplerect->outline_what & 0x1) { if (begin == simplerect->bbox_ulx) { PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey); } } - + if (simplerect->outline_what & 0x2) { if (end == (simplerect->bbox_lrx - 1)) { PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1); } } - + if (simplerect->outline_what & 0x4) { PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i); } - + if (simplerect->outline_what & 0x8) { PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i); } @@ -662,7 +658,7 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, int end, begin; int ey, sy; int i; - + simplerect = GNOME_CANVAS_SIMPLERECT (item); if (parent_class->render) { @@ -707,23 +703,23 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, if (simplerect->outline_a) { for (i = 0; i < (int) simplerect->outline_pixels; ++i) { - + if (simplerect->outline_what & 0x1) { if (begin == simplerect->bbox_ulx) { PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey); } } - + if (simplerect->outline_what & 0x2) { if (end == (simplerect->bbox_lrx - 1)) { PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1); } } - + if (simplerect->outline_what & 0x4) { PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i); } - + if (simplerect->outline_what & 0x8) { PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i); } @@ -847,12 +843,9 @@ gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx (void) cx; (void) cy; - GnomeCanvasSimpleRect *simplerect; double x1, y1, x2, y2; double dx, dy; - simplerect = GNOME_CANVAS_SIMPLERECT (item); - *actual_item = item; /* Find the bounds for the rectangle plus its outline width */