Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 12349)
+++ trunk/src/crosshair.c	(revision 12350)
@@ -374,7 +374,7 @@
 			pcb_draw_wireframe_line(pcb_crosshair.GC,
 															line.Point1.X, line.Point1.Y,
 															line.Point2.X, line.Point2.Y, 
-															line.Thickness);
+															line.Thickness, 0);
 			
 			/* Draw the DRC outline if it is enabled */
 			if (conf_core.editor.show_drc) {
@@ -381,7 +381,7 @@
 				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
 				pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y,
 																line.Point2.X, line.Point2.Y,
-																line.Thickness + 2 * (PCB->Bloat + 1) );
+																line.Thickness + 2 * (PCB->Bloat + 1), 0);
 				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
 			}
 			break;
@@ -433,13 +433,13 @@
 			point2.Y += dy;				
 
 			if(conf_core.editor.move_linepoint_uses_route == 0) {/* config setting for selecting new 45/90 method */ 
-				pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y, line->Thickness);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y, line->Thickness, 0);
 
 				/* Draw the DRC outline if it is enabled */
 				if (conf_core.editor.show_drc) {
 					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
 					pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, 
-																	point2.Y,line->Thickness + 2 * (PCB->Bloat + 1) );
+																	point2.Y,line->Thickness + 2 * (PCB->Bloat + 1), 0);
 					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
 				}
 			}
@@ -873,7 +873,7 @@
 																pcb_crosshair.AttachedLine.Point1.X,
 																pcb_crosshair.AttachedLine.Point1.Y,
 																pcb_crosshair.AttachedLine.Point2.X,
-																pcb_crosshair.AttachedLine.Point2.Y, 10 );
+																pcb_crosshair.AttachedLine.Point2.Y, 10, 0);
 		}
 		else if(pcb_crosshair.Route.size > 0)	{	
 			pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC);
Index: trunk/src/draw_wireframe.h
===================================================================
--- trunk/src/draw_wireframe.h	(revision 12349)
+++ trunk/src/draw_wireframe.h	(revision 12350)
@@ -51,7 +51,7 @@
 /*-----------------------------------------------------------
  * Draws the outline of a line
  */
-static inline PCB_FUNC_UNUSED void pcb_draw_wireframe_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thick)
+static inline PCB_FUNC_UNUSED void pcb_draw_wireframe_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thick, int square)
 {
 	if((x1 != x2) || (y1 != y2)) {
 		double dx = x2 - x1;
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 12349)
+++ trunk/src/obj_line.c	(revision 12350)
@@ -1006,7 +1006,7 @@
 
 		if(conf_core.editor.wireframe_draw) { 
 			pcb_gui->set_line_width(Output.fgGC, 0);
-			pcb_draw_wireframe_line(Output.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness);
+			pcb_draw_wireframe_line(Output.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0);
 		}
 	}
 
Index: trunk/src/obj_padstack.c
===================================================================
--- trunk/src/obj_padstack.c	(revision 12349)
+++ trunk/src/obj_padstack.c	(revision 12350)
@@ -297,8 +297,7 @@
 				pcb_gui->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[0], ps->y + shape->data.poly.y[0]);
 				break;
 			case PCB_PSSH_LINE:
-				pcb_draw_wireframe_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2, shape->data.line.thickness);
-/*				pcb_gui->set_line_cap(gc, shape->data.line.square ? Square_Cap : Round_Cap);*/
+				pcb_draw_wireframe_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2, shape->data.line.thickness, shape->data.line.square);
 				break;
 			case PCB_PSSH_CIRC:
 				pcb_gui->draw_arc(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2, shape->data.circ.dia/2, 0, 360); 
Index: trunk/src/route.c
===================================================================
--- trunk/src/route.c	(revision 12349)
+++ trunk/src/route.c	(revision 12350)
@@ -603,7 +603,7 @@
 
 		switch(p_obj->type) {
 			case PCB_TYPE_LINE :	
-				pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,p_route->thickness);
+				pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,p_route->thickness, 0);
 				break;
 
 			case PCB_TYPE_ARC :		
@@ -632,7 +632,7 @@
 
 		switch(p_obj->type) {
 			case PCB_TYPE_LINE :	
-				pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,thickness);	
+				pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,thickness, 0);
 				break;
 
 			case PCB_TYPE_ARC :		
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c	(revision 12349)
+++ trunk/src_plugins/rubberband_orig/rubberband.c	(revision 12350)
@@ -1017,15 +1017,15 @@
 
 			if (PCB_FLAG_TEST(PCB_FLAG_RAT, ptr->Line)) {
 				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.rat);
-				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness, 0);
 			}
 			else if(direct || (conf_core.editor.move_linepoint_uses_route == 0)) {
 				pcb_gui->set_color(pcb_crosshair.GC,ptr->Layer->meta.real.color);
-				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness, 0);
 				/* Draw the DRC outline if it is enabled */
 				if (conf_core.editor.show_drc) {
 					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
-					pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1],ptr->Line->Thickness + 2 * (PCB->Bloat + 1) );
+					pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1],ptr->Line->Thickness + 2 * (PCB->Bloat + 1), 0);
 				}
 			}
 			else {