Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26808)
+++ trunk/src/hid.h	(revision 26809)
@@ -543,8 +543,8 @@
 
 	/* Change the mouse cursor to a named cursor e.g. after the tool has changed.
 	   The list of cursors names available may depend on the HID. */
-	void (*reg_mouse_cursor)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask);
-	void (*set_mouse_cursor)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx);
+	void (*reg_mouse_cursor)(pcb_hid_t *hid, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask);
+	void (*set_mouse_cursor)(pcb_hid_t *hid, int idx);
 
 	/* change top window title any time the after the GUI_INIT event */
 	void (*set_top_title)(pcb_hid_t *hid, pcb_hidlib_t *hidlib, const char *title);
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26808)
+++ trunk/src/hid_nogui.c	(revision 26809)
@@ -458,11 +458,11 @@
 	free(data);
 }
 
-static void nogui_reg_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
+static void nogui_reg_mouse_cursor(pcb_hid_t *hid, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
 {
 }
 
-static void nogui_set_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx)
+static void nogui_set_mouse_cursor(pcb_hid_t *hid, int idx)
 {
 }
 
Index: trunk/src/hidlib.c
===================================================================
--- trunk/src/hidlib.c	(revision 26808)
+++ trunk/src/hidlib.c	(revision 26809)
@@ -36,7 +36,7 @@
 static void hidlib_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_tool_gui_init();
-	pcb_gui->set_mouse_cursor(pcb_gui, hidlib, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */
+	pcb_gui->set_mouse_cursor(pcb_gui, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */
 }
 
 void pcbhl_log_print_uninit_errs(const char *title)
Index: trunk/src/tool.c
===================================================================
--- trunk/src/tool.c	(revision 26808)
+++ trunk/src/tool.c	(revision 26809)
@@ -78,7 +78,7 @@
 	id = pcb_tools.used;
 	vtp0_append(&pcb_tools, (void *)tool);
 	if (pcb_gui != NULL)
-		pcb_gui->reg_mouse_cursor(pcb_gui, NULL, id, tool->cursor.name, tool->cursor.pixel, tool->cursor.mask);
+		pcb_gui->reg_mouse_cursor(pcb_gui, id, tool->cursor.name, tool->cursor.pixel, tool->cursor.mask);
 	pcb_event(&PCB->hidlib, PCB_EVENT_TOOL_REG, "p", tool);
 	return 0;
 }
@@ -149,7 +149,7 @@
 	pcb_crosshair_move_relative(0, 0);
 	pcb_notify_crosshair_change(pcb_true);
 	if (pcb_gui != NULL)
-		pcb_gui->set_mouse_cursor(pcb_gui, hidlib, id);
+		pcb_gui->set_mouse_cursor(pcb_gui, id);
 	return 0;
 }
 
@@ -198,7 +198,7 @@
 
 	for(n = 0, tool = (pcb_tool_t **)pcb_tools.array; n < pcb_tools.used; n++,tool++)
 		if (*tool != NULL)
-			pcb_gui->reg_mouse_cursor(pcb_gui, NULL, n, (*tool)->cursor.name, (*tool)->cursor.pixel, (*tool)->cursor.mask);
+			pcb_gui->reg_mouse_cursor(pcb_gui, n, (*tool)->cursor.name, (*tool)->cursor.pixel, (*tool)->cursor.mask);
 }
 
 /**** current tool function wrappers ****/
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26808)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26809)
@@ -2998,12 +2998,12 @@
 	cmd_is_active = 1;
 }
 
-static void ltf_reg_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
+static void ltf_reg_mouse_cursor(pcb_hid_t *hid, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
 {
 
 }
 
-static void ltf_set_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx)
+static void ltf_set_mouse_cursor(pcb_hid_t *hid, int idx)
 {
 }
 
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26808)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26809)
@@ -521,12 +521,12 @@
 	pcb_gtk_zoom_view_win_side(&ghidgui->port.view, 0, 0, hidlib->size_x, hidlib->size_y, 0);
 }
 
-static void ghid_reg_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
+static void ghid_reg_mouse_cursor(pcb_hid_t *hid, int idx, const char *name, const unsigned char *pixel, const unsigned char *mask)
 {
 	ghid_port_reg_mouse_cursor(ghidgui, idx, name, pixel, mask);
 }
 
-static void ghid_set_mouse_cursor(pcb_hid_t *hid, pcb_hidlib_t *hidlib, int idx)
+static void ghid_set_mouse_cursor(pcb_hid_t *hid, int idx)
 {
 	ghid_port_set_mouse_cursor(ghidgui, idx);
 }