--- a/gtk/dw.c	Wed Oct 30 12:19:26 2002 +0000
+++ b/gtk/dw.c	Wed Nov 06 17:28:04 2002 +0000
@@ -6783,7 +6783,6 @@
 	return ret;
 }
 
-#ifndef NO_SIGNALS
 /*
  * Add a callback to a window event.
  * Parameters:
@@ -6949,156 +6948,4 @@
 {
 	dw_signal_disconnect_by_data(window, data);
 }
-#endif
-
-#ifdef TEST
-HWND mainwindow,
-	 listbox,
-	 okbutton,
-	 cancelbutton,
-	 lbbox,
-	 stext,
-	 buttonbox,
-	 testwindow,
-	 testbox,
-	 testok,
-	 testcancel,
-	 testbox2,
-	 testok2,
-	 testcancel2,
-	 notebook;
-int count = 2;
-
-int test_callback(HWND window, void *data)
-{
-	dw_window_destroy((HWND)data);
-	/* Return -1 to allow the default handlers to return. */
-	count--;
-	if(!count)
-		exit(0);
-	return -1;
-}
-
-/*
- * Let's demonstrate the functionality of this library. :)
- */
-int main(int argc, char *argv[])
-{
-	unsigned long flStyle = DW_FCF_SYSMENU | DW_FCF_TITLEBAR |
-		DW_FCF_SHELLPOSITION | DW_FCF_TASKLIST | DW_FCF_DLGBORDER;
-	int pageid;
-
-	dw_init(TRUE, argc, argv);
-
-	/* Try a little server dialog. :) */
-	mainwindow = dw_window_new(DW_DESKTOP, "Server", flStyle | DW_FCF_SIZEBORDER | DW_FCF_MINMAX);
-
-	lbbox = dw_box_new(BOXVERT, 10);
-
-	dw_box_pack_start(mainwindow, lbbox, 0, 0, TRUE, TRUE, 0);
-
-	stext = dw_text_new("Choose a server:", 0);
-
-	dw_window_set_style(stext, DW_DT_VCENTER, DW_DT_VCENTER);
-
-	dw_box_pack_start(lbbox, stext, 130, 15, FALSE, FALSE, 10);
-
-	listbox = dw_listbox_new(100L, FALSE);
-
-	dw_box_pack_start(lbbox, listbox, 130, 200, TRUE, TRUE, 10);
-
-	buttonbox = dw_box_new(BOXHORZ, 0);
-
-	dw_box_pack_start(lbbox, buttonbox, 0, 0, TRUE, TRUE, 0);
-
-	okbutton = dw_button_new("Ok", 1001L);
-
-	dw_box_pack_start(buttonbox, okbutton, 50, 30, TRUE, TRUE, 5);
-
-	cancelbutton = dw_button_new("Cancel", 1002L);
-
-	dw_box_pack_start(buttonbox, cancelbutton, 50, 30, TRUE, TRUE, 5);
-
-	/* Set some nice fonts and colors */
-	dw_window_set_color(lbbox, DW_CLR_PALEGRAY, DW_CLR_PALEGRAY);
-	dw_window_set_color(buttonbox, DW_CLR_PALEGRAY, DW_CLR_PALEGRAY);
-	dw_window_set_font(stext, "9.WarpSans");
-	dw_window_set_color(stext, DW_CLR_BLACK, DW_CLR_PALEGRAY);
-	dw_window_set_font(listbox, "9.WarpSans");
-	dw_window_set_font(okbutton, "9.WarpSans");
-	dw_window_set_font(cancelbutton, "9.WarpSans");
-
-	dw_window_show(mainwindow);
-
-	dw_window_set_usize(mainwindow, 170, 340);
-
-	/* Another small example */
-	flStyle |= DW_FCF_MINMAX | DW_FCF_SIZEBORDER;
-
-	testwindow = dw_window_new(DW_DESKTOP, "Wow a test dialog! :) yay!", flStyle);
-
-	testbox = dw_box_new(BOXVERT, 0);
-
-	dw_box_pack_start(testwindow, testbox, 0, 0, TRUE, TRUE, 0);
-
-	notebook = dw_notebook_new(1010L, TRUE);
-
-	dw_box_pack_start(testbox, notebook, 100, 100, TRUE, TRUE, 0);
-
-	testbox = dw_box_new(BOXVERT, 10);
-
-	pageid = dw_notebook_page_new(notebook, 0L, FALSE);
-
-	dw_notebook_pack(notebook, pageid, testbox);
-
-	dw_notebook_page_set_text(notebook, pageid, "Test page");
-	dw_notebook_page_set_status_text(notebook, pageid, "Test page");
-
-	testok = dw_button_new("Ok", 1003L);
-
-	dw_box_pack_start(testbox, testok, 60, 40, TRUE, TRUE, 10);
-
-	testcancel = dw_button_new("Cancel", 1004L);
-
-	dw_box_pack_start(testbox, testcancel, 60, 40, TRUE, TRUE, 10);
-
-	testbox2 = dw_box_new(BOXHORZ, 0);
-
-	dw_box_pack_start(testbox, testbox2, 0, 0, TRUE, TRUE, 0);
-
-	testok2 = dw_button_new("Ok", 1003L);
-
-	dw_box_pack_start(testbox2, testok2, 60, 40, TRUE, TRUE, 10);
-
-	dw_box_pack_splitbar_start(testbox2);
-
-	testcancel2 = dw_button_new("Cancel", 1004L);
-
-	dw_box_pack_start(testbox2, testcancel2, 60, 40, TRUE, TRUE, 10);
-
-	/* Set some nice fonts and colors */
-	dw_window_set_color(testbox, DW_CLR_PALEGRAY, DW_CLR_PALEGRAY);
-	dw_window_set_color(testbox2, DW_CLR_PALEGRAY, DW_CLR_PALEGRAY);
-	dw_window_set_font(testok, "9.WarpSans");
-	dw_window_set_font(testcancel, "9.WarpSans");
-	dw_window_set_font(testok2, "9.WarpSans");
-	dw_window_set_font(testcancel2, "9.WarpSans");
-
-	dw_window_show(testwindow);
-
-	/* Setup the function callbacks */
-	dw_signal_connect(okbutton, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)mainwindow);
-	dw_signal_connect(cancelbutton, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)mainwindow);
-	dw_signal_connect(testok, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)testwindow);
-	dw_signal_connect(testcancel, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)testwindow);
-	dw_signal_connect(testok2, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)testwindow);
-	dw_signal_connect(testcancel2, "clicked", DW_SIGNAL_FUNC(test_callback), (void *)testwindow);
-	dw_signal_connect(mainwindow, "delete_event", DW_SIGNAL_FUNC(test_callback), (void *)mainwindow);
-	dw_signal_connect(testwindow, "delete_event", DW_SIGNAL_FUNC(test_callback), (void *)testwindow);
-
-	dw_main();
-
-	return 0;
-}
-#endif
-
+