Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 10757)
+++ trunk/src/draw.c	(revision 10758)
@@ -765,7 +765,7 @@
 
 	if (pcb_gui->gui)
 		pcb_draw_doing_pinout++;
-	pcb_text_draw(&text, 0);
+	pcb_text_draw_(&text, 0);
 	if (pcb_gui->gui)
 		pcb_draw_doing_pinout--;
 }
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 10757)
+++ trunk/src/obj_elem.c	(revision 10758)
@@ -1824,7 +1824,7 @@
 	else
 		pcb_gui->set_color(Output.fgGC, conf_core.appearance.color.invisible_objects);
 
-	pcb_text_draw(&PCB_ELEM_TEXT_VISIBLE(PCB, element), PCB->minSlk);
+	pcb_text_draw_(&PCB_ELEM_TEXT_VISIBLE(PCB, element), PCB->minSlk);
 
 }
 
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 10757)
+++ trunk/src/obj_pad.c	(revision 10758)
@@ -462,7 +462,7 @@
 	text.fid = 0;
 	text.Direction = (vert ? 1 : 0) + (flip_x ? 2 : 0);
 
-	pcb_text_draw(&text, 0);
+	pcb_text_draw_(&text, 0);
 }
 
 static void _draw_pad(pcb_hid_gc_t gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask)
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 10757)
+++ trunk/src/obj_text.c	(revision 10758)
@@ -716,22 +716,16 @@
 	}
 }
 
-void pcb_text_draw(pcb_text_t *Text, pcb_coord_t min_line_width)
+void pcb_text_draw_(pcb_text_t *Text, pcb_coord_t min_line_width)
 {
 	DrawTextLowLevel_(Text, min_line_width, 0, 0, 0);
 }
 
-
-pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl)
+static void pcb_text_draw(pcb_layer_t *layer, pcb_text_t *text)
 {
-	pcb_layer_t *layer = cl;
-	pcb_text_t *text = (pcb_text_t *) b;
 	int min_silk_line;
 	unsigned int flg = 0;
 
-	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent))
-		return PCB_R_DIR_FOUND_CONTINUE;
-
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
 		pcb_gui->set_color(Output.fgGC, layer->meta.real.selected_color);
 	else
@@ -744,7 +738,19 @@
 		min_silk_line = PCB->minSlk;
 	else
 		min_silk_line = PCB->minWid;
-	pcb_text_draw(text, min_silk_line);
+
+	pcb_text_draw_(text, min_silk_line);
+}
+
+pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_layer_t *layer = cl;
+	pcb_text_t *text = (pcb_text_t *) b;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	pcb_text_draw(layer, text);
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
 
Index: trunk/src/obj_text_draw.h
===================================================================
--- trunk/src/obj_text_draw.h	(revision 10757)
+++ trunk/src/obj_text_draw.h	(revision 10758)
@@ -32,7 +32,7 @@
 pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl);
 #endif
 
-void pcb_text_draw(pcb_text_t *Text, pcb_coord_t min_line_width);
+void pcb_text_draw_(pcb_text_t *Text, pcb_coord_t min_line_width);
 void pcb_text_invalidate_erase(pcb_layer_t *Layer, pcb_text_t *Text);
 void pcb_text_invalidate_draw(pcb_layer_t *Layer, pcb_text_t *Text);
 void pcb_text_draw_xor(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y);
Index: trunk/src/stub_draw.c
===================================================================
--- trunk/src/stub_draw.c	(revision 10757)
+++ trunk/src/stub_draw.c	(revision 10758)
@@ -42,7 +42,7 @@
 	t.fid = 0; /* use the default font */
 	t.Scale = 150;
 	t.Flags = pcb_no_flags();
-	pcb_text_draw(&t, 0);
+	pcb_text_draw_(&t, 0);
 }
 
 static pcb_bool dummy_mouse(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
Index: trunk/src_plugins/draw_csect/draw_csect.c
===================================================================
--- trunk/src_plugins/draw_csect/draw_csect.c	(revision 10757)
+++ trunk/src_plugins/draw_csect/draw_csect.c	(revision 10758)
@@ -67,7 +67,7 @@
 	t.Scale = scale;
 	t.fid = 0; /* use the default font */
 	t.Flags = pcb_no_flags();
-	pcb_text_draw(&t, 0);
+	pcb_text_draw_(&t, 0);
 	return &t;
 }
 
@@ -83,7 +83,7 @@
 	t.Scale = scale;
 	t.fid = 0; /* use the default font */
 	t.Flags = pcb_no_flags();
-	pcb_text_draw(&t, th);
+	pcb_text_draw_(&t, th);
 	return &t;
 }
 
@@ -102,11 +102,11 @@
 
 	if (pcb_gui->gui) { /* it is unreadable on black&white and on most exporters */
 		pcb_gui->set_color(gc, bgcolor);
-		pcb_text_draw(&t, 1000000);
+		pcb_text_draw_(&t, 1000000);
 	}
 
 	pcb_gui->set_color(gc, fgcolor);
-	pcb_text_draw(&t, 0);
+	pcb_text_draw_(&t, 0);
 
 	return &t;
 }
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 10757)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 10758)
@@ -90,7 +90,7 @@
 	t.X -= w * (align & 3) / 2;
 	if (t.X < 0)
 		t.X = 0;
-	pcb_text_draw(&t, 0);
+	pcb_text_draw_(&t, 0);
 	if (align & 8)
 		fab_line(gc, t.X,
 						 t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10),
@@ -292,7 +292,7 @@
 		PCB_END_LOOP;
 		PCB_TEXT_LOOP(layer);
 		{
-			pcb_text_draw(text, 0);
+			pcb_text_draw_(text, 0);
 		}
 		PCB_END_LOOP;
 		pcb_gui->set_line_width(gc, FAB_LINE_W);
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 10757)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 10758)
@@ -58,7 +58,7 @@
 	t.Scale = scale;
 	t.fid = fid;
 	t.Flags = pcb_no_flags();
-	pcb_text_draw(&t, 0);
+	pcb_text_draw_(&t, 0);
 	return &t;
 }