Index: layersel/layersel.c
===================================================================
--- layersel/layersel.c	(revision 8494)
+++ layersel/layersel.c	(revision 8495)
@@ -118,7 +118,7 @@
 }
 
 /** Main widget building function */
-GtkWidget *pcb_gtk_layersel_build(GtkWidget *mainwin)
+GtkWidget *pcb_gtk_layersel_build(void)
 {
 	GtkWidget *main_box;
 	GtkWidget *box, *spring;
@@ -148,8 +148,5 @@
 	spring = gtkc_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(main_box), spring, TRUE, TRUE, 0);
 
-	gtk_container_add(GTK_CONTAINER(mainwin), main_box);
-	gtk_widget_show_all(mainwin);
-
-	return box;
+	return main_box;
 }
Index: layersel/layersel.h
===================================================================
--- layersel/layersel.h	(revision 8494)
+++ layersel/layersel.h	(revision 8495)
@@ -1,4 +1,4 @@
 #include <gtk/gtk.h>
 
 
-GtkWidget *pcb_gtk_layersel_build(GtkWidget * mainwin);
+GtkWidget *pcb_gtk_layersel_build(void);
Index: layersel/layersel_demo.c
===================================================================
--- layersel/layersel_demo.c	(revision 8494)
+++ layersel/layersel_demo.c	(revision 8495)
@@ -5,7 +5,7 @@
 int main(int argc, char **argv)
 {
 	GtkWidget *mainwin;
-	GtkWidget *box;
+	GtkWidget *layer_selector;
 
 	/* Initialize the widget set */
 	gtk_init(&argc, &argv);
@@ -15,7 +15,9 @@
 	g_signal_connect(G_OBJECT(mainwin), "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
 	/* Set up GUI elements */
-	box = pcb_gtk_layersel_build(mainwin);
+	layer_selector = pcb_gtk_layersel_build();
+	gtk_container_add(GTK_CONTAINER(mainwin), layer_selector);
+	gtk_widget_show_all(mainwin);
 
 	/* Show the application window */
 	gtk_widget_show_all(mainwin);