Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26874)
+++ trunk/src/hid.h	(revision 26875)
@@ -279,7 +279,7 @@
 
 	/* Make an empty graphics context.  */
 	pcb_hid_gc_t (*make_gc)(pcb_hid_t *hid);
-	void (*destroy_gc)(pcb_hid_t *hid, pcb_hid_gc_t gc);
+	void (*destroy_gc)(pcb_hid_gc_t gc);
 
 	/* Composite layer drawing: manipulate the sketch canvas and set
 	   positive or negative drawing mode. The canvas covers the screen box. */
Index: trunk/src/hid_inlines.h
===================================================================
--- trunk/src/hid_inlines.h	(revision 26874)
+++ trunk/src/hid_inlines.h	(revision 26875)
@@ -46,7 +46,7 @@
 
 PCB_INLINE void pcb_hid_destroy_gc(pcb_hid_gc_t gc)
 {
-	pcb_gui->destroy_gc(pcb_gui, gc);
+	pcb_gui->destroy_gc(gc);
 }
 
 PCB_INLINE void pcb_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26874)
+++ trunk/src/hid_nogui.c	(revision 26875)
@@ -96,7 +96,7 @@
 	return 0;
 }
 
-static void nogui_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void nogui_destroy_gc(pcb_hid_gc_t gc)
 {
 }
 
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 26874)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 26875)
@@ -433,7 +433,7 @@
 	return rv;
 }
 
-static void dxf_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void dxf_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 26874)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 26875)
@@ -315,7 +315,7 @@
 	return rv;
 }
 
-static void excellon_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void excellon_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 26874)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 26875)
@@ -596,7 +596,7 @@
 	return rv;
 }
 
-static void gcode_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void gcode_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 26874)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 26875)
@@ -57,7 +57,7 @@
 static void gerber_do_export(pcb_hid_t *hid, pcb_hid_attr_val_t *options);
 static int gerber_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv);
 static pcb_hid_gc_t gerber_make_gc(pcb_hid_t *hid);
-static void gerber_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc);
+static void gerber_destroy_gc(pcb_hid_gc_t gc);
 static void gerber_set_color(pcb_hid_gc_t gc, const pcb_color_t *name);
 static void gerber_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
 static void gerber_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
@@ -904,7 +904,7 @@
 	return rv;
 }
 
-static void gerber_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void gerber_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 26874)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 26875)
@@ -703,7 +703,7 @@
 	return rv;
 }
 
-static void openems_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void openems_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 26874)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 26875)
@@ -421,7 +421,7 @@
 	return rv;
 }
 
-static void openscad_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void openscad_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 26874)
+++ trunk/src_plugins/export_png/png.c	(revision 26875)
@@ -1382,7 +1382,7 @@
 	return rv;
 }
 
-static void png_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void png_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 26874)
+++ trunk/src_plugins/export_ps/eps.c	(revision 26875)
@@ -35,7 +35,7 @@
 static int eps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv);
 static int eps_set_layer_group(pcb_hid_t *hid, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
 static pcb_hid_gc_t eps_make_gc(pcb_hid_t *hid);
-static void eps_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc);
+static void eps_destroy_gc(pcb_hid_gc_t gc);
 static void eps_set_color(pcb_hid_gc_t gc, const pcb_color_t *name);
 static void eps_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
 static void eps_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
@@ -461,7 +461,7 @@
 	return rv;
 }
 
-static void eps_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void eps_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 26874)
+++ trunk/src_plugins/export_ps/ps.c	(revision 26875)
@@ -949,7 +949,7 @@
 	return rv;
 }
 
-static void ps_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void ps_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 26874)
+++ trunk/src_plugins/export_svg/svg.c	(revision 26875)
@@ -474,7 +474,7 @@
 	return rv;
 }
 
-static void svg_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void svg_destroy_gc(pcb_hid_gc_t gc)
 {
 	free(gc);
 }
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 26874)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 26875)
@@ -180,7 +180,7 @@
 	return (pcb_hid_gc_t)&hc;
 }
 
-static void batch_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void batch_destroy_gc(pcb_hid_gc_t gc)
 {
 }
 
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26874)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26875)
@@ -101,7 +101,7 @@
 	return 1;
 }
 
-static void ghid_gdk_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void ghid_gdk_destroy_gc(pcb_hid_gc_t gc)
 {
 	if (gc->pixel_gc)
 		g_object_unref(gc->pixel_gc);
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26874)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26875)
@@ -162,7 +162,7 @@
 	drawgl_reset();
 }
 
-void ghid_gl_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+void ghid_gl_destroy_gc(pcb_hid_gc_t gc)
 {
 	g_free(gc);
 }
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26874)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26875)
@@ -2237,7 +2237,7 @@
 	return rv;
 }
 
-static void lesstif_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void lesstif_destroy_gc(pcb_hid_gc_t gc)
 {
 	if (gc->colorname != NULL)
 		free(gc->colorname);
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 26874)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 26875)
@@ -184,7 +184,7 @@
 	return idx;
 }
 
-static void remote_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void remote_destroy_gc(pcb_hid_gc_t gc)
 {
 	int idx = gc2idx(gc);
 	if (idx >= 0)
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 26874)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 26875)
@@ -79,10 +79,10 @@
 	return delegatee_->make_gc(hid);
 }
 
-static void log_destroy_gc(pcb_hid_t *hid, pcb_hid_gc_t gc)
+static void log_destroy_gc(pcb_hid_gc_t gc)
 {
 	pcb_fprintf(out_, "destroy_gc()\n");
-	delegatee_->destroy_gc(hid, gc);
+	delegatee_->destroy_gc(gc);
 }
 
 static void log_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)