Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 24377)
+++ trunk/src/draw.c	(revision 24378)
@@ -1066,7 +1066,7 @@
 	}
 
 
-void pcb_term_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
+void pcb_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
 {
 	int mirror, direction;
 	PCB_TERM_LABEL_SETUP;
@@ -1083,7 +1083,7 @@
 		pcb_draw_force_termlab--;
 }
 
-void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
+void pcb_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
 {
 	pcb_coord_t ox = x, oy = y, margin = 0;
 	pcb_box_t b;
@@ -1099,3 +1099,13 @@
 	pcb_draw_invalidate(&b);
 }
 
+void pcb_term_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const pcb_any_obj_t *obj)
+{
+	pcb_label_draw(info, x, y, scale, vert, centered, obj->term, obj->intconn);
+}
+
+void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const pcb_any_obj_t *obj)
+{
+	pcb_label_invalidate(x, y, scale, vert, centered, obj->term, obj->intconn);
+}
+
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 24377)
+++ trunk/src/draw.h	(revision 24378)
@@ -161,8 +161,10 @@
 int pcb_draw_layergrp_is_comp(const pcb_layergrp_t *g);
 
 /* Draw (render) or invalidate a terminal label */
-void pcb_term_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
-void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
+void pcb_term_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const pcb_any_obj_t *obj);
+void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const pcb_any_obj_t *obj);
+void pcb_label_draw(pcb_draw_info_t *info, pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
+void pcb_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
 
 
 /* Schedule an object to be called again at the end for drawing its labels 
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 24377)
+++ trunk/src/obj_arc.c	(revision 24378)
@@ -905,7 +905,7 @@
 		pcb_bool_t vert;
 
 		arc_label_pos(arc, &x0, &y0, &vert);
-		pcb_term_label_invalidate(x0, y0, 100.0, vert, pcb_true, arc->term, arc->intconn);
+		pcb_term_label_invalidate(x0, y0, 100.0, vert, pcb_true, (pcb_any_obj_t *)arc);
 	}
 }
 
@@ -916,7 +916,7 @@
 		pcb_bool_t vert;
 
 		arc_label_pos(arc, &x0, &y0, &vert);
-		pcb_term_label_draw(info, x0, y0, conf_core.appearance.term_label_size, vert, pcb_true, arc->term, arc->intconn);
+		pcb_term_label_draw(info, x0, y0, conf_core.appearance.term_label_size, vert, pcb_true, (pcb_any_obj_t *)arc);
 	}
 }
 
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 24377)
+++ trunk/src/obj_line.c	(revision 24378)
@@ -1056,7 +1056,7 @@
 {
 	if (line->term != NULL) {
 		pcb_term_label_invalidate((line->Point1.X + line->Point2.X)/2, (line->Point1.Y + line->Point2.Y)/2,
-			100.0, is_line_term_vert(line), pcb_true, line->term, line->intconn);
+			100.0, is_line_term_vert(line), pcb_true, (pcb_any_obj_t *)line);
 	}
 }
 
@@ -1064,7 +1064,7 @@
 {
 	if (line->term != NULL)
 		pcb_term_label_draw(info, (line->Point1.X + line->Point2.X)/2, (line->Point1.Y + line->Point2.Y)/2,
-			conf_core.appearance.term_label_size, is_line_term_vert(line), pcb_true, line->term, line->intconn);
+			conf_core.appearance.term_label_size, is_line_term_vert(line), pcb_true, (pcb_any_obj_t *)line);
 }
 
 
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 24377)
+++ trunk/src/obj_poly.c	(revision 24378)
@@ -1081,7 +1081,7 @@
 {
 	if (poly->term != NULL) {
 		pcb_term_label_invalidate((poly->BoundingBox.X1 + poly->BoundingBox.X2)/2, (poly->BoundingBox.Y1 + poly->BoundingBox.Y2)/2,
-			100.0, is_poly_term_vert(poly), pcb_true, poly->term, poly->intconn);
+			100.0, is_poly_term_vert(poly), pcb_true, (pcb_any_obj_t *)poly);
 	}
 }
 
@@ -1089,7 +1089,7 @@
 {
 	if (poly->term != NULL)
 		pcb_term_label_draw(info, (poly->BoundingBox.X1 + poly->BoundingBox.X2)/2, (poly->BoundingBox.Y1 + poly->BoundingBox.Y2)/2,
-			conf_core.appearance.term_label_size, is_poly_term_vert(poly), pcb_true, poly->term, poly->intconn);
+			conf_core.appearance.term_label_size, is_poly_term_vert(poly), pcb_true, (pcb_any_obj_t *)poly);
 }
 
 void pcb_poly_draw_annotation(pcb_draw_info_t *info, pcb_poly_t *poly)
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 24377)
+++ trunk/src/obj_pstk.c	(revision 24378)
@@ -762,9 +762,9 @@
 	proto = pcb_pstk_get_proto(ps);
 	if ((proto != NULL) && (proto->hdia > 0))
 		offs = proto->hdia/2;
-	pcb_term_label_draw(info, ps->x + offs, ps->y, conf_core.appearance.term_label_size, vert, pcb_false, ps->term, ps->intconn);
+	pcb_term_label_draw(info, ps->x + offs, ps->y, conf_core.appearance.term_label_size, vert, pcb_false, (pcb_any_obj_t *)ps);
 #endif
-	pcb_term_label_draw(info, ps->x, ps->y, conf_core.appearance.term_label_size, vert, pcb_true, ps->term, ps->intconn);
+	pcb_term_label_draw(info, ps->x, ps->y, conf_core.appearance.term_label_size, vert, pcb_true, (pcb_any_obj_t *)ps);
 }
 
 void pcb_pstk_draw_preview(pcb_board_t *pcb, const pcb_pstk_t *ps, char *layers, pcb_bool mark, pcb_bool label, const pcb_box_t *drawn_area)
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 24377)
+++ trunk/src/obj_subc.c	(revision 24378)
@@ -1731,7 +1731,7 @@
 					next++;
 					ctrl = 1;
 				}
-				pcb_term_label_draw(info, x, y, conf_core.appearance.term_label_size/2, 0, 0, curr, subc->intconn);
+				pcb_label_draw(info, x, y, conf_core.appearance.term_label_size/2, 0, 0, curr, subc->intconn);
 				if (ctrl) {
 					switch(*next) {
 						case 'n': y += dy; x = x0; break;
@@ -1741,10 +1741,10 @@
 			}
 		}
 		else
-			pcb_term_label_draw(info, x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, "<err>", subc->intconn);
+			pcb_label_draw(info, x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, "<err>", subc->intconn);
 	}
 	else if (subc->refdes != NULL)
-		pcb_term_label_draw(info, x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, subc->refdes, subc->intconn);
+		pcb_label_draw(info, x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, subc->refdes, subc->intconn);
 
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 24377)
+++ trunk/src/obj_text.c	(revision 24378)
@@ -1234,7 +1234,7 @@
 {
 	if (text->term != NULL)
 		pcb_term_label_invalidate((text->BoundingBox.X1 + text->BoundingBox.X2)/2, (text->BoundingBox.Y1 + text->BoundingBox.Y2)/2,
-			100.0, is_text_term_vert(text), pcb_true, text->term, text->intconn);
+			100.0, is_text_term_vert(text), pcb_true, (pcb_any_obj_t *)text);
 }
 
 void pcb_text_draw_label(pcb_draw_info_t *info, pcb_text_t *text)
@@ -1241,7 +1241,7 @@
 {
 	if (text->term != NULL)
 		pcb_term_label_draw(info, (text->BoundingBox.X1 + text->BoundingBox.X2)/2, (text->BoundingBox.Y1 + text->BoundingBox.Y2)/2,
-			conf_core.appearance.term_label_size, is_text_term_vert(text), pcb_true, text->term, text->intconn);
+			conf_core.appearance.term_label_size, is_text_term_vert(text), pcb_true, (pcb_any_obj_t *)text);
 }