Index: draw_fab.c
===================================================================
--- draw_fab.c	(revision 5047)
+++ draw_fab.c	(revision 5048)
@@ -52,13 +52,13 @@
 
 static void fab_line(pcb_hid_gc_t gc, int x1, int y1, int x2, int y2)
 {
-	gui->draw_line(gc, x1, y1, x2, y2);
+	pcb_gui->draw_line(gc, x1, y1, x2, y2);
 }
 
 static void fab_circle(pcb_hid_gc_t gc, int x, int y, int r)
 {
-	gui->draw_arc(gc, x, y, r, r, 0, 180);
-	gui->draw_arc(gc, x, y, r, r, 180, 180);
+	pcb_gui->draw_arc(gc, x, y, r, r, 0, 180);
+	pcb_gui->draw_arc(gc, x, y, r, r, 180, 180);
 }
 
 /* align is 0=left, 1=center, 2=right, add 8 for underline */
@@ -187,7 +187,7 @@
 		yoff -= (4 - ds) * TEXT_LINE;
 	}
 
-	gui->set_line_width(gc, FAB_LINE_W);
+	pcb_gui->set_line_width(gc, FAB_LINE_W);
 
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
 		int plated_sym = -1, unplated_sym = -1;
@@ -196,7 +196,7 @@
 			plated_sym = --ds;
 		if (drill->UnplatedCount)
 			unplated_sym = --ds;
-		gui->set_color(gc, PCB->PinColor);
+		pcb_gui->set_color(gc, PCB->PinColor);
 		for (i = 0; i < drill->PinN; i++)
 			drill_sym(gc, PCB_FLAG_TEST(PCB_FLAG_HOLE, drill->Pin[i]) ? unplated_sym : plated_sym, drill->Pin[i]->X, drill->Pin[i]->Y);
 		if (plated_sym != -1) {
@@ -212,7 +212,7 @@
 			text_at(gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO");
 			text_at(gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount);
 		}
-		gui->set_color(gc, PCB->ElementColor);
+		pcb_gui->set_color(gc, PCB->ElementColor);
 		text_at(gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize) + 0.0004);
 		if (plated_sym != -1 && unplated_sym != -1)
 			text_at(gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize) + 0.0004);
@@ -221,7 +221,7 @@
 		total_drills += drill->ViaCount;
 	}
 
-	gui->set_color(gc, PCB->ElementColor);
+	pcb_gui->set_color(gc, PCB->ElementColor);
 	text_at(gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol");
 	text_at(gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)");
 	text_at(gc, PCB_MIL_TO_COORD(950), yoff, PCB_MIL_TO_COORD(9), "Count");
@@ -247,13 +247,13 @@
 		}
 	}
 	if (i == pcb_max_copper_layer) {
-		gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
-		gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0);
-		gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight);
-		gui->draw_line(gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
-		gui->draw_line(gc, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
+		pcb_gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
+		pcb_gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0);
+		pcb_gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight);
+		pcb_gui->draw_line(gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
+		pcb_gui->draw_line(gc, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
 		/*FPrintOutline (); */
-		gui->set_line_width(gc, FAB_LINE_W);
+		pcb_gui->set_line_width(gc, FAB_LINE_W);
 		text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0,
 						"Maximum Dimensions: %f mils wide, %f mils high", PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight));
 		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1,
@@ -263,15 +263,15 @@
 	}
 	else {
 		pcb_layer_t *layer = LAYER_PTR(i);
-		gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
+		pcb_gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
 		PCB_LINE_LOOP(layer);
 		{
-			gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+			pcb_gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
 		}
 		END_LOOP;
 		PCB_ARC_LOOP(layer);
 		{
-			gui->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+			pcb_gui->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 		}
 		END_LOOP;
 		PCB_TEXT_LOOP(layer);
@@ -279,7 +279,7 @@
 			DrawTextLowLevel(text, 0);
 		}
 		END_LOOP;
-		gui->set_line_width(gc, FAB_LINE_W);
+		pcb_gui->set_line_width(gc, FAB_LINE_W);
 		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path");
 	}
 	yoff -= TEXT_LINE;