Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 10644)
+++ trunk/doc/developer/renames	(revision 10645)
@@ -1697,3 +1697,6 @@
 draw_line -> pcb_line_draw
 EraseLine -> pcb_line_invalidate_erase
 DrawLine -> pcb_line_invalidate_draw
+draw_poly_callback -> pcb_poly_draw_callback
+ErasePolygon -> pcb_poly_invalidate_erase
+DrawPolygon -> pcb_poly_invalidate_draw
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 10644)
+++ trunk/src/action_helper.c	(revision 10645)
@@ -282,7 +282,7 @@
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon)) {
 			PCB_FLAG_CLEAR(PCB_FLAG_WARN, polygon);
-			DrawPolygon(layer, polygon);
+			pcb_poly_invalidate_draw(layer, polygon);
 		}
 	}
 	PCB_ENDALL_LOOP;
@@ -932,7 +932,7 @@
 				pcb_obj_add_attribs(polygon, PCB->pen_attr);
 				pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, CURRENT, polygon, polygon);
 				pcb_undo_inc_serial();
-				DrawPolygon(CURRENT, polygon);
+				pcb_poly_invalidate_draw(CURRENT, polygon);
 				pcb_draw();
 			}
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 10644)
+++ trunk/src/draw.c	(revision 10645)
@@ -435,7 +435,7 @@
 
 
 	/* print the non-clearing polys */
-	pcb_r_search(Layer->polygon_tree, screen, NULL, draw_poly_callback, &info, NULL);
+	pcb_r_search(Layer->polygon_tree, screen, NULL, pcb_poly_draw_callback, &info, NULL);
 
 	if (conf_core.editor.check_planes)
 		return;
@@ -503,7 +503,7 @@
 		EraseText((pcb_layer_t *) lptr, (pcb_text_t *) ptr);
 		break;
 	case PCB_TYPE_POLYGON:
-		ErasePolygon((pcb_polygon_t *) ptr);
+		pcb_poly_invalidate_erase((pcb_polygon_t *) ptr);
 		break;
 	case PCB_TYPE_ELEMENT:
 		EraseElement((pcb_element_t *) ptr);
@@ -550,7 +550,7 @@
 		break;
 	case PCB_TYPE_POLYGON:
 		if (((pcb_layer_t *) ptr1)->meta.real.vis)
-			DrawPolygon((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr2);
+			pcb_poly_invalidate_draw((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr2);
 		break;
 	case PCB_TYPE_ELEMENT:
 		if (pcb_silk_on(PCB) && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn))
Index: trunk/src/find_clear.c
===================================================================
--- trunk/src/find_clear.c	(revision 10644)
+++ trunk/src/find_clear.c	(revision 10645)
@@ -126,7 +126,7 @@
 				pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon);
 			PCB_FLAG_CLEAR(flag, polygon);
 			if (AndDraw)
-				DrawPolygon(layer, polygon);
+				pcb_poly_invalidate_draw(layer, polygon);
 			change = pcb_true;
 		}
 	}
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 10644)
+++ trunk/src/find_drc.c	(revision 10645)
@@ -291,7 +291,7 @@
 doIsBad:
 	pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon);
 	PCB_FLAG_SET(PCB_FLAG_FOUND, polygon);
-	DrawPolygon(layer, polygon);
+	pcb_poly_invalidate_draw(layer, polygon);
 	pcb_draw_obj(type, ptr1, ptr2);
 	drcerr_count++;
 	LocateError(&x, &y);
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 10644)
+++ trunk/src/find_misc.c	(revision 10645)
@@ -106,7 +106,7 @@
 			/* draw all new polygons */
 			position = PolygonList[layer].DrawLocation;
 			for (; position < PolygonList[layer].Number; position++)
-				DrawPolygon(LAYER_PTR(layer), POLYGONLIST_ENTRY(layer, position));
+				pcb_poly_invalidate_draw(LAYER_PTR(layer), POLYGONLIST_ENTRY(layer, position));
 			PolygonList[layer].DrawLocation = PolygonList[layer].Number;
 		}
 	}
@@ -438,7 +438,7 @@
 				pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon);
 			PCB_FLAG_CLEAR(TheFlag, polygon);
 			if (AndDraw)
-				DrawPolygon(layer, polygon);
+				pcb_poly_invalidate_draw(layer, polygon);
 			change = pcb_true;
 		}
 	}
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 10644)
+++ trunk/src/obj_poly.c	(revision 10645)
@@ -411,7 +411,7 @@
 	pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
 	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon);
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
-	DrawPolygon(Layer, Polygon);
+	pcb_poly_invalidate_draw(Layer, Polygon);
 	return (Polygon);
 }
 
@@ -435,7 +435,7 @@
 	/*
 	 * second, shift the points up to make room for the new point
 	 */
-	ErasePolygon(Polygon);
+	pcb_poly_invalidate_erase(Polygon);
 	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	save = *pcb_poly_point_new(Polygon, ctx->insert.x, ctx->insert.y);
 	for (n = Polygon->PointN - 1; n > ctx->insert.idx; n--)
@@ -454,7 +454,7 @@
 	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
 	if (ctx->insert.forcible || !pcb_poly_remove_excess_points(Layer, Polygon)) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		pcb_draw();
 	}
 	return (&Polygon->Points[ctx->insert.idx]);
@@ -475,7 +475,7 @@
 void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon)
 {
 	if (Layer->meta.real.vis) {
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 	}
 	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	pcb_poly_move(Polygon, ctx->move.dx, ctx->move.dy);
@@ -482,7 +482,7 @@
 	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
 	if (Layer->meta.real.vis) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		pcb_draw();
 	}
 	return (Polygon);
@@ -492,7 +492,7 @@
 void *pcb_polyop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point)
 {
 	if (Layer->meta.real.vis) {
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 	}
 	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
@@ -501,7 +501,7 @@
 	pcb_poly_remove_excess_points(Layer, Polygon);
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
 	if (Layer->meta.real.vis) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		pcb_draw();
 	}
 	return (Point);
@@ -559,7 +559,7 @@
 		return (Polygon);
 	pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
 	if (Layer->meta.real.vis)
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 	/* Move all of the thermals with the polygon */
 	d.snum = pcb_layer_id(PCB->Data, Layer);
 	d.dnum = pcb_layer_id(PCB->Data, ctx->move.dst_layer);
@@ -571,7 +571,7 @@
 	newone = (struct pcb_polygon_s *) pcb_polyop_move_to_layer_low(ctx, Layer, Polygon, ctx->move.dst_layer);
 	pcb_poly_init_clip(PCB->Data, ctx->move.dst_layer, newone);
 	if (ctx->move.dst_layer->meta.real.vis) {
-		DrawPolygon(ctx->move.dst_layer, newone);
+		pcb_poly_invalidate_draw(ctx->move.dst_layer, newone);
 		pcb_draw();
 	}
 	return (newone);
@@ -629,7 +629,7 @@
 {
 	/* erase from screen */
 	if (Layer->meta.real.vis) {
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 		if (!ctx->remove.bulk)
 			pcb_draw();
 	}
@@ -660,7 +660,7 @@
 		return pcb_poly_remove(Layer, Polygon);
 
 	if (Layer->meta.real.vis) {
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 		if (!ctx->remove.bulk)
 			pcb_draw();
 	}
@@ -685,7 +685,7 @@
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
 	/* redraw polygon if necessary */
 	if (Layer->meta.real.vis) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		if (!ctx->remove.bulk)
 			pcb_draw();
 	}
@@ -710,7 +710,7 @@
 		return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour);
 
 	if (Layer->meta.real.vis)
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 
 	/* insert the polygon-point into the undo list */
 	pcb_undo_add_obj_to_remove_point(PCB_TYPE_POLYGON_POINT, Layer, Polygon, point_idx);
@@ -733,7 +733,7 @@
 
 	/* redraw polygon if necessary */
 	if (Layer->meta.real.vis) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		if (!ctx->remove.bulk)
 			pcb_draw();
 	}
@@ -752,7 +752,7 @@
 		Layer->polygon_tree = pcb_r_create_tree(NULL, 0, 0);
 	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon, 0);
 	pcb_poly_init_clip(PCB->Data, Layer, polygon);
-	DrawPolygon(Layer, polygon);
+	pcb_poly_invalidate_draw(Layer, polygon);
 	pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, Layer, polygon, polygon);
 	return (polygon);
 }
@@ -760,13 +760,13 @@
 void *pcb_polyop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon)
 {
 	if (Layer->meta.real.vis)
-		ErasePolygon(Polygon);
+		pcb_poly_invalidate_erase(Polygon);
 	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	pcb_poly_rotate90(Polygon, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
 	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
 	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
 	if (Layer->meta.real.vis) {
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		pcb_draw();
 	}
 	return Polygon;
@@ -810,7 +810,7 @@
 
 
 /*** draw ***/
-pcb_r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t pcb_poly_draw_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_draw_info_t *i = cl;
 	pcb_polygon_t *polygon = (pcb_polygon_t *) b;
@@ -855,13 +855,13 @@
 }
 
 /* erases a polygon on a layer */
-void ErasePolygon(pcb_polygon_t *Polygon)
+void pcb_poly_invalidate_erase(pcb_polygon_t *Polygon)
 {
 	pcb_draw_invalidate(Polygon);
 	pcb_flag_erase(&Polygon->Flags);
 }
 
-void DrawPolygon(pcb_layer_t *Layer, pcb_polygon_t *Polygon)
+void pcb_poly_invalidate_draw(pcb_layer_t *Layer, pcb_polygon_t *Polygon)
 {
 	pcb_draw_invalidate(Polygon);
 }
Index: trunk/src/obj_poly_draw.h
===================================================================
--- trunk/src/obj_poly_draw.h	(revision 10644)
+++ trunk/src/obj_poly_draw.h	(revision 10645)
@@ -28,8 +28,8 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-pcb_r_dir_t draw_poly_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_poly_draw_callback(const pcb_box_t * b, void *cl);
 #endif
 
-void ErasePolygon(pcb_polygon_t *Polygon);
-void DrawPolygon(pcb_layer_t *Layer, pcb_polygon_t *Polygon);
+void pcb_poly_invalidate_erase(pcb_polygon_t *Polygon);
+void pcb_poly_invalidate_draw(pcb_layer_t *Layer, pcb_polygon_t *Polygon);
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 10644)
+++ trunk/src/polygon.c	(revision 10645)
@@ -1394,7 +1394,7 @@
 	pcb_add_polygon_on_layer(CURRENT, polygon);
 
 	pcb_poly_init_clip(PCB->Data, CURRENT, polygon);
-	DrawPolygon(CURRENT, polygon);
+	pcb_poly_invalidate_draw(CURRENT, polygon);
 	pcb_board_set_changed_flag(pcb_true);
 
 	/* reset state of attached line */
@@ -1827,7 +1827,7 @@
 		return pcb_false;
 	if (poly->Clipped->f == poly->Clipped)
 		return pcb_false;
-	ErasePolygon(poly);
+	pcb_poly_invalidate_erase(poly);
 	start = p = poly->Clipped;
 	/* This is ugly. The creation of the new polygons can cause
 	 * all of the polygon pointers (including the one we're called
@@ -1866,7 +1866,7 @@
 			p = p->f;									/* go to next pline */
 			newone->Clipped->b = newone->Clipped->f = newone->Clipped;	/* unlink from others */
 			pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) newone, 0);
-			DrawPolygon(layer, newone);
+			pcb_poly_invalidate_draw(layer, newone);
 		}
 		else {
 			pcb_polyarea_t *t = p;
@@ -1968,7 +1968,7 @@
 			Layer->polygon_tree = pcb_r_create_tree(NULL, 0, 0);
 		pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
 
-		DrawPolygon(Layer, Polygon);
+		pcb_poly_invalidate_draw(Layer, Polygon);
 		/* add to undo list */
 		pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, Layer, Polygon, Polygon);
 	}
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 10644)
+++ trunk/src/select.c	(revision 10645)
@@ -175,7 +175,7 @@
 			layer = (pcb_layer_t *) ptr1;
 			pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, ptr1, ptr2, ptr2);
 			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, poly);
-			DrawPolygon(layer, poly);
+			pcb_poly_invalidate_draw(layer, poly);
 			/* changing memory order no longer effects draw order */
 			break;
 		}
@@ -358,7 +358,7 @@
 					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon) != Flag) {
 				append(PCB_TYPE_POLYGON, layer, polygon);
 				if (layer->meta.real.vis)
-					DrawPolygon(layer, polygon);
+					pcb_poly_invalidate_draw(layer, polygon);
 			}
 		}
 		PCB_END_LOOP;
@@ -560,7 +560,7 @@
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, polygon) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon)) {
 			pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon);
 			PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, polygon);
-			DrawPolygon(layer, polygon);
+			pcb_poly_invalidate_draw(layer, polygon);
 			changed = pcb_true;
 		}
 	}
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 10644)
+++ trunk/src/undo.c	(revision 10645)
@@ -703,7 +703,7 @@
 		{
 			/* recover the point */
 			if (andDraw && layer->meta.real.vis)
-				ErasePolygon(polygon);
+				pcb_poly_invalidate_erase(polygon);
 			pcb_insert_point_in_object(PCB_TYPE_POLYGON, layer, polygon,
 														&Entry->Data.RemovedPoint.Index,
 														Entry->Data.RemovedPoint.X,
@@ -711,7 +711,7 @@
 
 			polygon->Points[Entry->Data.RemovedPoint.Index].ID = Entry->Data.RemovedPoint.ID;
 			if (andDraw && layer->meta.real.vis)
-				DrawPolygon(layer, polygon);
+				pcb_poly_invalidate_draw(layer, polygon);
 			Entry->Type = PCB_UNDO_INSERT_POINT;
 			Entry->ID = Entry->Data.RemovedPoint.ID;
 			Entry->Kind = PCB_TYPE_POLYGON_POINT;
@@ -744,7 +744,7 @@
 	case PCB_TYPE_POLYGON_POINT:			/* removes an inserted polygon point */
 		{
 			if (andDraw && layer->meta.real.vis)
-				ErasePolygon(polygon);
+				pcb_poly_invalidate_erase(polygon);
 
 			/* Check whether this point was at the end of its contour.
 			 * If so, we need to flag as such when re-adding the point
@@ -767,7 +767,7 @@
 			Entry->Data.RemovedPoint.Index = point_idx;
 			pcb_destroy_object(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt);
 			if (andDraw && layer->meta.real.vis)
-				DrawPolygon(layer, polygon);
+				pcb_poly_invalidate_draw(layer, polygon);
 			return (pcb_true);
 		}
 
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 10644)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 10645)
@@ -90,7 +90,7 @@
 	/* add */
 	pcb_add_polygon_on_layer(layer, np);
 	pcb_poly_init_clip(PCB->Data, layer, np);
-	DrawPolygon(layer, np);
+	pcb_poly_invalidate_draw(layer, np);
 }
 
 static int FontEdit(int argc, const char **argv, pcb_coord_t Ux, pcb_coord_t Uy)
Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 10644)
+++ trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 10645)
@@ -173,7 +173,7 @@
 		if (PCB_FLAG_TEST(flag, polygon)) {
 			pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon);
 			PCB_FLAG_CLEAR(flag, polygon);
-			DrawPolygon(layer, polygon);
+			pcb_poly_invalidate_draw(layer, polygon);
 			change = pcb_true;
 		}
 	}
Index: trunk/src_plugins/polystitch/polystitch.c
===================================================================
--- trunk/src_plugins/polystitch/polystitch.c	(revision 10644)
+++ trunk/src_plugins/polystitch/polystitch.c	(revision 10645)
@@ -185,8 +185,8 @@
 	int ii, oo;
 	double best = -1, dist;
 
-	ErasePolygon(inner_poly);
-	ErasePolygon(outer_poly);
+	pcb_poly_invalidate_erase(inner_poly);
+	pcb_poly_invalidate_erase(outer_poly);
 
 	/* This is O(n^2) but there's not a lot we can do about that.  */
 	for (i = 0; i < inner_poly->PointN; i++)
@@ -220,7 +220,7 @@
 	pcb_r_insert_entry(poly_layer->polygon_tree, (pcb_box_t *) outer_poly, 0);
 	pcb_poly_remove_excess_points(poly_layer, outer_poly);
 	pcb_poly_init_clip(PCB->Data, poly_layer, outer_poly);
-	DrawPolygon(poly_layer, outer_poly);
+	pcb_poly_invalidate_draw(poly_layer, outer_poly);
 	pcb_draw();
 
 	pcb_poly_remove(poly_layer, inner_poly);