Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 29420)
+++ trunk/src/draw.c	(revision 29421)
@@ -1083,8 +1083,15 @@
 	pcb_render = pcb_draw_out.hid;
 }
 
-void pcb_draw_setup_default_xform(pcb_hid_t *hid, pcb_draw_info_t *info)
+void pcb_draw_setup_default_gui_xform(pcb_xform_t *dst)
 {
+	dst->wireframe = conf_core.editor.wireframe_draw;
+	dst->thin_draw = conf_core.editor.thin_draw;
+	dst->thin_draw_poly = conf_core.editor.thin_draw_poly;
+}
+
+void pcb_draw_setup_default_xform_info(pcb_hid_t *hid, pcb_draw_info_t *info)
+{
 	static pcb_xform_t xf_def = {0};
 	static pcb_xform_t xform_main_exp;
 
@@ -1100,9 +1107,7 @@
 		else if (hid->gui) {
 			/* no xform means we should use the default logic designed for the GUI */
 			info->xform = info->xform_exporter = info->xform_caller = &xf_def;
-			xf_def.wireframe = conf_core.editor.wireframe_draw;
-			xf_def.thin_draw = conf_core.editor.thin_draw;
-			xf_def.thin_draw_poly = conf_core.editor.thin_draw_poly;
+			pcb_draw_setup_default_gui_xform(&xf_def);
 		}
 	}
 }
@@ -1120,7 +1125,7 @@
 		info.xform = info.xform_exporter = NULL;
 		info.layer = NULL;
 
-		pcb_draw_setup_default_xform(hid, &info);
+		pcb_draw_setup_default_xform_info(hid, &info);
 
 		draw_everything(&info);
 		expose_end(&save);
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 29420)
+++ trunk/src/draw.h	(revision 29421)
@@ -170,8 +170,10 @@
 void pcb_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *label);
 
 
-void pcb_draw_setup_default_xform(pcb_hid_t *hid, pcb_draw_info_t *info);
+void pcb_draw_setup_default_xform_info(pcb_hid_t *hid, pcb_draw_info_t *info);
+void pcb_draw_setup_default_gui_xform(pcb_xform_t *dst);
 
+
 /* Schedule an object to be called again at the end for drawing its labels 
    on top of everything. */
 void pcb_draw_delay_label_add(pcb_any_obj_t *obj);
Index: trunk/src/draw_composite.c
===================================================================
--- trunk/src/draw_composite.c	(revision 29420)
+++ trunk/src/draw_composite.c	(revision 29421)
@@ -192,7 +192,7 @@
 	info.pcb = pcb;
 	info.drawn_area = screen;
 
-	pcb_draw_setup_default_xform(hid, &info);
+	pcb_draw_setup_default_xform_info(hid, &info);
 	xform_setup(&info, &tmp, NULL);
 
 	for(gid = 0, g = pcb->LayerGroups.grp; gid < pcb->LayerGroups.len; gid++,g++) {