Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 26786)
+++ trunk/src/buffer.c	(revision 26787)
@@ -862,7 +862,7 @@
 		case F_Save:
 			free_name = pcb_false;
 			if (argc <= 1) {
-				name = pcb_gui->fileselect("Save Paste Buffer As ...",
+				name = pcb_gui->fileselect(pcb_gui, "Save Paste Buffer As ...",
 															 "Choose a file to save the contents of the\n"
 																 "paste buffer to.\n", default_file, ".fp", NULL, "footprint", 0, NULL);
 
Index: trunk/src/error.c
===================================================================
--- trunk/src/error.c	(revision 26786)
+++ trunk/src/error.c	(revision 26787)
@@ -231,7 +231,7 @@
 				memset(&fmtsub, 0, sizeof(fmtsub));
 				PCB_DAD_ENUM(fmtsub.dlg, fmts);
 					wfmt = PCB_DAD_CURRENT(fmtsub.dlg);
-				fn = pcb_gui->fileselect("Export log", NULL, "log.txt", NULL, NULL, "log", PCB_HID_FSD_MAY_NOT_EXIST, &fmtsub);
+				fn = pcb_gui->fileselect(pcb_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", PCB_HID_FSD_MAY_NOT_EXIST, &fmtsub);
 				if (fn != NULL) {
 					ret = pcb_log_export(NULL, fn, (fmtsub.dlg[wfmt].default_val.int_value == 1));
 					if (ret != 0)
Index: trunk/src/font_act.c
===================================================================
--- trunk/src/font_act.c	(revision 26786)
+++ trunk/src/font_act.c	(revision 26787)
@@ -75,7 +75,7 @@
 			{"all",                 NULL, flt_any},
 			{NULL, NULL,NULL}
 		};
-		fname = pcb_gui->fileselect(
+		fname = pcb_gui->fileselect(pcb_gui,
 			"Load PCB font file...", "Picks a PCB font file to load.\n",
 			default_file, ".font", flt, "pcbfont", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
@@ -147,7 +147,7 @@
 	}
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Save PCB font file...",
+		fname = pcb_gui->fileselect(pcb_gui, "Save PCB font file...",
 																"Picks a PCB font file to save.\n",
 																default_file, ".font", NULL, "pcbfont", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
 		if (fname == NULL)
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26786)
+++ trunk/src/hid.h	(revision 26787)
@@ -388,7 +388,7 @@
 	 *  get_path       returns the current full path in res as an strdup'd string (caller needs to free it)
 	 *  set_file_name  replaces the file name portion of the current path from arg[0].d.s
 	 */
-	char *(*fileselect)(const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
+	char *(*fileselect)(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
 
 	/* A generic dialog to ask for a set of attributes. If n_attrs_ is
 	   zero, attrs_(.name) must be NULL terminated. attr_dlg_run returns
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26786)
+++ trunk/src/hid_nogui.c	(revision 26787)
@@ -330,7 +330,7 @@
 
 /* FIXME - this could use some enhancement to actually use the other
    args */
-static char *nogui_fileselect(const char *title, const char *descr,
+static char *nogui_fileselect(pcb_hid_t *hid, const char *title, const char *descr,
 															const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub)
 {
 	char *answer;
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 26786)
+++ trunk/src/rats_patch.c	(revision 26787)
@@ -506,7 +506,7 @@
 		else
 			default_file = pcb_strdup("unnamed.bap");
 
-		fn = pcb_gui->fileselect("Save netlist patch as ...",
+		fn = pcb_gui->fileselect(pcb_gui, "Save netlist patch as ...",
 			"Choose a file to save netlist patch to\n"
 			"for back annotation\n", default_file, ".bap", NULL, "patch", 0, NULL);
 
Index: trunk/src_plugins/dialogs/dlg_loadsave.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 26786)
+++ trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 26787)
@@ -71,13 +71,13 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str);
 
 	if (pcb_strcasecmp(function, "Netlist") == 0)
-		name = pcb_gui->fileselect("Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", PCB_HID_FSD_READ, NULL);
+		name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", PCB_HID_FSD_READ, NULL);
 	else if ((pcb_strcasecmp(function, "FootprintToBuffer") == 0) || (pcb_strcasecmp(function, "ElementToBuffer") == 0))
-		name = pcb_gui->fileselect("Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", PCB_HID_FSD_READ, NULL);
+		name = pcb_gui->fileselect(pcb_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", PCB_HID_FSD_READ, NULL);
 	else if (pcb_strcasecmp(function, "LayoutToBuffer") == 0)
-		name = pcb_gui->fileselect("Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL);
+		name = pcb_gui->fileselect(pcb_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL);
 	else if (pcb_strcasecmp(function, "Layout") == 0)
-		name = pcb_gui->fileselect("Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL);
+		name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL);
 	else {
 		pcb_message(PCB_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function);
 		PCB_ACT_IRES(1);
@@ -506,7 +506,7 @@
 	timer_ctx.ptr = &save;
 	save.timer_active = 1;
 	save.timer = pcb_gui->add_timer(pcb_gui, save_timer, 300, timer_ctx); /* the timer needs to run at least once, to get some initialization done that can be done only after fmtsub got created */
-	final_name = pcb_gui->fileselect(prompt, NULL, name_in, NULL, NULL, "board", PCB_HID_FSD_MAY_NOT_EXIST, fmtsub);
+	final_name = pcb_gui->fileselect(pcb_gui, prompt, NULL, name_in, NULL, NULL, "board", PCB_HID_FSD_MAY_NOT_EXIST, fmtsub);
 	if (save.timer_active)
 		pcb_gui->stop_timer(pcb_gui, save.timer);
 	free(name_in);
@@ -563,7 +563,7 @@
 	if (lock)
 		return 1;
 
-	name = pcb_gui->fileselect("Load schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
+	name = pcb_gui->fileselect(pcb_gui, "Load schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
 	if (name != NULL) {
 		pcb_attrib_put(PCB, "import::src0", name);
 		free(name);
Index: trunk/src_plugins/dialogs/dlg_pref_win.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 26786)
+++ trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 26787)
@@ -101,7 +101,7 @@
 {
 	char *fname;
 
-	fname = pcb_gui->fileselect("Save window geometry to...",
+	fname = pcb_gui->fileselect(pcb_gui, "Save window geometry to...",
 		"Pick a file for saving window geometry to.\n",
 		"win_geo.lht", ".lht", NULL, "wingeo", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
 
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 26786)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 26787)
@@ -439,7 +439,7 @@
 	char *fn;
 	FILE *f;
 
-	fn = pcb_gui->fileselect("Save view list", "Save all views from the list", "view.lht", "lht", NULL, "view", 0, NULL);
+	fn = pcb_gui->fileselect(pcb_gui, "Save view list", "Save all views from the list", "view.lht", "lht", NULL, "view", 0, NULL);
 	if (fn == NULL)
 		return;
 
@@ -468,7 +468,7 @@
 	FILE *f;
 	void *load_ctx;
 
-	fn = pcb_gui->fileselect("Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", PCB_HID_FSD_READ, NULL);
+	fn = pcb_gui->fileselect(pcb_gui, "Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", PCB_HID_FSD_READ, NULL);
 	if (fn == NULL)
 		return;
 
Index: trunk/src_plugins/export_openems/mesh.c
===================================================================
--- trunk/src_plugins/export_openems/mesh.c	(revision 26786)
+++ trunk/src_plugins/export_openems/mesh.c	(revision 26787)
@@ -957,7 +957,7 @@
 	FILE *f;
 	gds_t tmp;
 
-	fname = pcb_gui->fileselect("Save mesh settings...",
+	fname = pcb_gui->fileselect(pcb_gui, "Save mesh settings...",
 															"Picks file for saving mesh settings.\n",
 															default_file, ".lht", NULL, "mesh", PCB_HID_FSD_MAY_NOT_EXIST, NULL);
 	if (fname == NULL)
@@ -987,7 +987,7 @@
 	char *fname = NULL;
 	FILE *f;
 
-	fname = pcb_gui->fileselect("Load mesh settings...",
+	fname = pcb_gui->fileselect(pcb_gui, "Load mesh settings...",
 															"Picks file for loading mesh settings from.\n",
 															default_file, ".lht", NULL, "mesh", PCB_HID_FSD_READ, NULL);
 	if (fname == NULL)
Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dlg_fileselect.c	(revision 26786)
+++ trunk/src_plugins/hid_lesstif/dlg_fileselect.c	(revision 26787)
@@ -127,7 +127,7 @@
 	return -1;
 }
 
-char *pcb_ltf_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub)
+char *pcb_ltf_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub)
 {
 	XmString xms_ext = NULL, xms_load = NULL;
 	pcb_ltf_fsd_t pctx;
Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.h
===================================================================
--- trunk/src_plugins/hid_lesstif/dlg_fileselect.h	(revision 26786)
+++ trunk/src_plugins/hid_lesstif/dlg_fileselect.h	(revision 26787)
@@ -1,2 +1,2 @@
 #include "global_typedefs.h"
-char *pcb_ltf_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
+char *pcb_ltf_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
Index: trunk/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- trunk/src_plugins/hid_lesstif/lesstif.h	(revision 26786)
+++ trunk/src_plugins/hid_lesstif/lesstif.h	(revision 26787)
@@ -54,7 +54,7 @@
 extern void lesstif_update_status_line();
 extern void lesstif_attributes_dialog(const char *, pcb_attribute_list_t *);
 void *lesstif_attr_sub_new(Widget parent_box, pcb_hid_attribute_t *attrs, int n_attrs, void *caller_data);
-char *pcb_ltf_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
+char *pcb_ltf_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
 
 extern int pcb_ltf_ok;
 int pcb_ltf_wait_for_dialog(Widget w);
Index: trunk/src_plugins/import_calay/calay.c
===================================================================
--- trunk/src_plugins/import_calay/calay.c	(revision 26786)
+++ trunk/src_plugins/import_calay/calay.c	(revision 26787)
@@ -201,7 +201,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str);
 
 	if (!fname_net || !*fname_net) {
-		fname_net = pcb_gui->fileselect(
+		fname_net = pcb_gui->fileselect(pcb_gui,
 			"Load calay netlist file...", "Picks a calay netlist file to load.\n",
 			default_file, NETEXT, NULL, "calay", PCB_HID_FSD_READ, NULL);
 		if (fname_net == NULL)
Index: trunk/src_plugins/import_dsn/dsn.c
===================================================================
--- trunk/src_plugins/import_dsn/dsn.c	(revision 26786)
+++ trunk/src_plugins/import_dsn/dsn.c	(revision 26787)
@@ -219,7 +219,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str);
 
 	if ((fname == NULL) || (*fname == '\0')) {
-		fname = pcb_gui->fileselect(
+		fname = pcb_gui->fileselect(pcb_gui,
 			"Load a routed dsn or ses file...",
 			"Select dsn or ses file to load.\nThe file could be generated using the tool downloaded from freeroute.net\n",
 			NULL, /* default file name */
Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c
===================================================================
--- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c	(revision 26786)
+++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c	(revision 26787)
@@ -170,7 +170,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect(
+		fname = pcb_gui->fileselect(pcb_gui,
 			"Load freepcb netlist...", "Picks a freepcb netlist file to load.\n",
 			default_file, ".net", NULL, "freepcb", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/import_hpgl/hpgl.c
===================================================================
--- trunk/src_plugins/import_hpgl/hpgl.c	(revision 26786)
+++ trunk/src_plugins/import_hpgl/hpgl.c	(revision 26787)
@@ -156,7 +156,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load HP-GL file...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load HP-GL file...",
 																"Picks a HP-GL plot file to load.\n",
 																default_file, ".hpgl", NULL, "hpgl", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/import_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/import_ipcd356/ipcd356.c	(revision 26786)
+++ trunk/src_plugins/import_ipcd356/ipcd356.c	(revision 26787)
@@ -366,7 +366,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str);
 
 	if ((fname == NULL) || (*fname == '\0')) {
-		fname = pcb_gui->fileselect("Load IPC-D-356 netlist...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load IPC-D-356 netlist...",
 			"Pick an IPC-D-356 netlist file.\n",
 			default_file, ".net", NULL, "ipcd356", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL) {
Index: trunk/src_plugins/import_ltspice/ltspice.c
===================================================================
--- trunk/src_plugins/import_ltspice/ltspice.c	(revision 26786)
+++ trunk/src_plugins/import_ltspice/ltspice.c	(revision 26787)
@@ -275,7 +275,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load ltspice net+asc file pair...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load ltspice net+asc file pair...",
 																"Picks a ltspice mentor net or asc file to load.\n",
 																default_file, ".asc", NULL, "ltspice", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c
===================================================================
--- trunk/src_plugins/import_mentor_sch/mentor_sch.c	(revision 26786)
+++ trunk/src_plugins/import_mentor_sch/mentor_sch.c	(revision 26787)
@@ -264,7 +264,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load mentor edf netlist file...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load mentor edf netlist file...",
 																"Picks a mentor edf file to load.\n",
 																default_file, ".edf", NULL, "mentor_sch", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/import_mucs/mucs.c
===================================================================
--- trunk/src_plugins/import_mucs/mucs.c	(revision 26786)
+++ trunk/src_plugins/import_mucs/mucs.c	(revision 26787)
@@ -73,7 +73,7 @@
 	}
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load mucs routing session Resource File...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load mucs routing session Resource File...",
 																"Picks a mucs session resource file to load.\n"
 																	"This file could be generated by mucs-pcb\n",
 																default_file, ".l1", NULL, "unixplot", PCB_HID_FSD_READ, NULL);
Index: trunk/src_plugins/import_tinycad/tinycad.c
===================================================================
--- trunk/src_plugins/import_tinycad/tinycad.c	(revision 26786)
+++ trunk/src_plugins/import_tinycad/tinycad.c	(revision 26787)
@@ -179,7 +179,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load tinycad netlist file...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load tinycad netlist file...",
 																"Picks a tinycad netlist file to load.\n",
 																default_file, ".net", NULL, "tinycad", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/io_hyp/io_hyp.c
===================================================================
--- trunk/src_plugins/io_hyp/io_hyp.c	(revision 26786)
+++ trunk/src_plugins/io_hyp/io_hyp.c	(revision 26787)
@@ -76,7 +76,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str);
 
 	if ((fname == NULL) || (*fname == '\0')) {
-		fname = pcb_gui->fileselect(
+		fname = pcb_gui->fileselect(pcb_gui,
 			"Load .hyp file...", "Picks a hyperlynx file to load.\n", "default.hyp",
 			".hyp", NULL, "hyp", PCB_HID_FSD_READ, NULL);
 	}
Index: trunk/src_plugins/io_kicad/read_net.c
===================================================================
--- trunk/src_plugins/io_kicad/read_net.c	(revision 26786)
+++ trunk/src_plugins/io_kicad/read_net.c	(revision 26787)
@@ -223,7 +223,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load eeschema netlist file...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load eeschema netlist file...",
 					"Picks a eeschema netlist file to load.\n",
 					default_file, ".net", NULL, "eeschema", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL)
Index: trunk/src_plugins/io_tedax/io_tedax.c
===================================================================
--- trunk/src_plugins/io_tedax/io_tedax.c	(revision 26786)
+++ trunk/src_plugins/io_tedax/io_tedax.c	(revision 26787)
@@ -112,7 +112,7 @@
 do { \
 	static char *default_file = NULL; \
 	if ((fname == NULL) || (*fname == '\0')) { \
-		fname = pcb_gui->fileselect("Load tedax " #type " file...", \
+		fname = pcb_gui->fileselect(pcb_gui, "Load tedax " #type " file...", \
 																"Picks a tedax " #type " file to load.\n", \
 																default_file, ".tdx", NULL, "tedax-" #type, PCB_HID_FSD_READ, NULL); \
 		if (fname == NULL) \
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26786)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26787)
@@ -290,7 +290,7 @@
 	return pcb_gtk_watch_file(ghidgui, fd, condition, func, user_data);
 }
 
-static char *ghid_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub)
+static char *ghid_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub)
 {
 	return pcb_gtk_fileselect(ghidgui, title, descr, default_file, default_ext, flt, history_tag, flags, sub);
 }
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 26786)
+++ trunk/src_plugins/renumber/renumber.c	(revision 26787)
@@ -89,7 +89,7 @@
 		 * We deal with the case where name already exists in this
 		 * function so the GUI doesn't need to deal with it
 		 */
-		name = pcb_gui->fileselect("Save Renumber Annotation File As ...",
+		name = pcb_gui->fileselect(pcb_gui, "Save Renumber Annotation File As ...",
 													 "Choose a file to record the renumbering to.\n"
 														 "This file may be used to back annotate the\n"
 														 "change to the schematics.\n", default_file, ".eco", NULL, "eco", 0, NULL);
Index: trunk/src_plugins/script/live_script.c
===================================================================
--- trunk/src_plugins/script/live_script.c	(revision 26786)
+++ trunk/src_plugins/script/live_script.c	(revision 26787)
@@ -334,7 +334,7 @@
 
 	if (fn == NULL) {
 		const char *default_ext = live_default_ext(lvs);
-		fn = pcb_gui->fileselect(
+		fn = pcb_gui->fileselect(pcb_gui,
 			"Load live script", "Load the a live script from file",
 			lvs->fn, default_ext, pcb_hid_fsd_filter_any, "live_script", PCB_HID_FSD_READ, NULL);
 		if (fn == NULL)
@@ -380,7 +380,7 @@
 		if (lvs->fn == NULL)
 			lvs->fn = pcb_concat(lvs->name, ".", default_ext, NULL);
 
-		fn = pcb_gui->fileselect(
+		fn = pcb_gui->fileselect(pcb_gui,
 			"Save live script", "Save the source of a live script",
 			lvs->fn, default_ext, pcb_hid_fsd_filter_any, "live_script", 0, NULL);
 		if (fn == NULL)
Index: trunk/src_plugins/script/script_act.c
===================================================================
--- trunk/src_plugins/script/script_act.c	(revision 26786)
+++ trunk/src_plugins/script/script_act.c	(revision 26787)
@@ -186,7 +186,7 @@
 {
 	script_dlg_t *ctx = caller_data;
 	int failed;
-	char *tmp, *fn = pcb_gui->fileselect("script to load", "Select a script file to load", NULL, NULL, NULL, "script", PCB_HID_FSD_READ, NULL);
+	char *tmp, *fn = pcb_gui->fileselect(pcb_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", PCB_HID_FSD_READ, NULL);
 	pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}};
 	typedef struct {
 		PCB_DAD_DECL_NOINIT(dlg)
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 26786)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 26787)
@@ -145,7 +145,7 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect("Load Vendor Resource File...",
+		fname = pcb_gui->fileselect(pcb_gui, "Load Vendor Resource File...",
 														"Picks a vendor resource file to load.\n"
 															"This file can contain drc settings for a\n"
 															"particular vendor as well as a list of\n"