Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 17367) +++ trunk/src_plugins/export_gcode/gcode.c (revision 17368) @@ -607,12 +607,6 @@ gc->erase = 0; return; } - if (!strcmp(name, "erase")) { - /* FIXME -- should be background, not white */ - gc->color = white; - gc->erase = 1; - return; - } gc->color = black; gc->erase = 0; return; Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 17367) +++ trunk/src_plugins/export_gerber/gerber.c (revision 17368) @@ -893,13 +893,8 @@ static void gerber_set_color(pcb_hid_gc_t gc, const char *name) { - if (strcmp(name, "erase") == 0) { + if (strcmp(name, "drill") == 0) { gc->color = 1; - gc->erase = 1; - gc->drill = 0; - } - else if (strcmp(name, "drill") == 0) { - gc->color = 1; gc->erase = 0; gc->drill = 1; } Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 17367) +++ trunk/src_plugins/export_nelma/nelma.c (revision 17368) @@ -713,12 +713,6 @@ gc->erase = 0; return; } - if (!strcmp(name, "erase")) { - /* FIXME -- should be background, not white */ - gc->color = white; - gc->erase = 1; - return; - } gc->color = black; gc->erase = 0; return; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 17367) +++ trunk/src_plugins/export_png/png.c (revision 17368) @@ -1409,9 +1409,6 @@ cval.ptr = gc->color; pcb_hid_cache_color(1, name, &cval, &color_cache); } - else if (strcmp(name, "erase") == 0) { - gc->color = black; /* safe to remove */ - } else { fprintf(stderr, "WE SHOULD NOT BE HERE!!!\n"); gc->color = black; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 17367) +++ trunk/src_plugins/export_ps/eps.c (revision 17368) @@ -442,11 +442,6 @@ gc->erase = 1; return; } - if (strcmp(name, "erase") == 0) { - gc->color = 0xffffff; - gc->erase = fast_erase ? 0 : 1; - return; - } if (strcmp(name, "drill") == 0) { gc->color = 0xffffff; gc->erase = 0; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 17367) +++ trunk/src_plugins/export_ps/ps.c (revision 17368) @@ -980,7 +980,7 @@ gc->r = gc->g = gc->b = 255; gc->erase = 0; } - else if (strcmp(name, "erase") == 0 || strcmp(name, "drill") == 0) { + else if (strcmp(name, "drill") == 0) { gc->r = gc->g = gc->b = 255; gc->erase = 1; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 17367) +++ trunk/src_plugins/export_svg/svg.c (revision 17368) @@ -473,11 +473,7 @@ name = "#ffffff"; gc->drill = 1; } - else if (strcmp(name, "erase") == 0) { -/* name = "#ffffff"; - gc->erase = 1;*/ - } - else if (drawing_mask) + if (drawing_mask) name = mask_color; if ((gc->color != NULL) && (strcmp(gc->color, name) == 0)) return; Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 17367) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 17368) @@ -553,9 +553,7 @@ if (colormap == NULL) colormap = gtk_widget_get_colormap(gport->top_window); - if (strcmp(name, "erase") == 0) { - } - else if (strcmp(name, "drill") == 0) { + if (strcmp(name, "drill") == 0) { gdk_gc_set_foreground(gc->pixel_gc, &priv->offlimits_color); } else { Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 17367) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 17368) @@ -393,13 +393,7 @@ if (colormap == NULL) colormap = gtk_widget_get_colormap(gport->top_window); - if (strcmp(gc->colorname, "erase") == 0) { - r = priv->bg_color.red / 65535.; - g = priv->bg_color.green / 65535.; - b = priv->bg_color.blue / 65535.; - a = 1.0; - } - else if (strcmp(gc->colorname, "drill") == 0) { + if (strcmp(gc->colorname, "drill") == 0) { r = priv->offlimits_color.red / 65535.; g = priv->offlimits_color.green / 65535.; b = priv->offlimits_color.blue / 65535.; Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 17367) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 17368) @@ -706,12 +706,7 @@ //if (gport->colormap == 0) // gport->colormap = gtk_widget_get_colormap(gport->top_window); - if (strcmp(name, "erase") == 0) { - copy_color(&gc->color, &priv->bg_color); - //gdk_cairo_set_source_rgba(cr, &priv->bg_color); - //gdk_gc_set_foreground(gc->gc, &gport->bg_color); - } - else if (strcmp(name, "drill") == 0) { + if (strcmp(name, "drill") == 0) { copy_color(&gc->color, &priv->offlimits_color); //gdk_cairo_set_source_rgba(cr, &priv->offlimits_color); //gdk_gc_set_foreground(gc->gc, &gport->offlimits_color); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 17367) +++ trunk/src_plugins/hid_lesstif/main.c (revision 17368) @@ -2966,11 +2966,7 @@ gc->colorname = pcb_strdup(name); } - if (strcmp(name, "erase") == 0) { - gc->color = bgcolor; - gc->erase = 1; - } - else if (strcmp(name, "drill") == 0) { + if (strcmp(name, "drill") == 0) { gc->color = offlimit_color; gc->erase = 0; }