clean out useless outdated #if 0 blocks they serve no purpose and keep causing confusion in core refactors. Better examples are available in other frontends or in teh revision control system if strictly necessary

1 files changed, 0 insertions, 696 deletions

diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index bdda729dd..da83d5898 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -112,19 +112,7 @@ struct beos_scaffolding {
 	BStringView		*status_bar;
 
 	BScrollView		*scroll_view;
-#warning XXX
-#if 0 /* GTK */
-	GtkEntryCompletion	*url_bar_completion;
-	GtkMenuBar		*menu_bar;
-	GtkMenuItem		*back_menu;
-	GtkMenuItem		*forward_menu;
-	GtkMenuItem		*stop_menu;
-	GtkMenuItem		*reload_menu;
-
-	GladeXML		*popup_xml;
-	GtkMenu			*popup_menu;
 
-#endif
 	struct beos_history_window *history_window;
 
 	int			throb_frame;
@@ -138,20 +126,10 @@ struct beos_history_window {
 	struct beos_scaffolding 	*g;
 	BWindow		*window;
 
-#warning XXX
-#if 0 /* GTK */
-	GtkWindow		*window;
-	GtkScrolledWindow	*scrolled;
-	GtkDrawingArea		*drawing_area;
-#endif
 };
 
 struct menu_events {
 	const char *widget;
-#warning XXX
-#if 0 /* GTK */
-	GCallback handler;
-#endif
 };
 
 // passed to the replicant main thread
@@ -177,116 +155,6 @@ extern int main(int argc, char** argv);
 // in fetch_rsrc.cpp
 extern BResources *gAppResources;
 
-
-#warning XXX
-#if 0 /* GTK */
-static gboolean nsbeos_window_url_activate_event(beosWidget *, gpointer);
-static gboolean nsbeos_window_url_changed(beosWidget *, GdkEventKey *, gpointer);
-
-static gboolean nsbeos_history_expose_event(beosWidget *, GdkEventExpose *,
-						gpointer);
-static gboolean nsbeos_history_button_press_event(beosWidget *, GdkEventButton *,
-						gpointer);
-
-static void nsbeos_attach_menu_handlers(GladeXML *, gpointer);
-
-gboolean nsbeos_openfile_open(beosWidget *widget, gpointer data);
-
-#define MENUEVENT(x) { #x, G_CALLBACK(nsbeos_on_##x##_activate) }
-#define MENUPROTO(x) static gboolean nsbeos_on_##x##_activate( \
-					beosMenuItem *widget, gpointer g)
-/* prototypes for menu handlers */
-/* file menu */
-MENUPROTO(new_window);
-MENUPROTO(open_location);
-MENUPROTO(open_file);
-MENUPROTO(close_window);
-MENUPROTO(quit);
-
-/* edit menu */
-MENUPROTO(preferences);
-
-/* view menu */
-MENUPROTO(stop);
-MENUPROTO(reload);
-MENUPROTO(zoom_in);
-MENUPROTO(normal_size);
-MENUPROTO(zoom_out);
-MENUPROTO(full_screen);
-MENUPROTO(menu_bar);
-MENUPROTO(tool_bar);
-MENUPROTO(status_bar);
-MENUPROTO(downloads);
-MENUPROTO(save_window_size);
-MENUPROTO(toggle_debug_rendering);
-MENUPROTO(save_box_tree);
-
-/* navigate menu */
-MENUPROTO(back);
-MENUPROTO(forward);
-MENUPROTO(home);
-MENUPROTO(local_history);
-MENUPROTO(global_history);
-
-/* help menu */
-MENUPROTO(about);
-
-/* structure used by nsbeos_attach_menu_handlers to connect menu items to
- * their handling functions.
- */
-static struct menu_events menu_events[] = {
-	/* file menu */
-	MENUEVENT(new_window),
-	MENUEVENT(open_location),
-	MENUEVENT(open_file),
-	MENUEVENT(close_window),
-	MENUEVENT(quit),
-
-	/* edit menu */
-	MENUEVENT(preferences),
-
-	/* view menu */
-	MENUEVENT(stop),
-	MENUEVENT(reload),
-	MENUEVENT(zoom_in),
-	MENUEVENT(normal_size),
-	MENUEVENT(zoom_out),
-	MENUEVENT(full_screen),
-	MENUEVENT(menu_bar),
-	MENUEVENT(tool_bar),
-	MENUEVENT(status_bar),
-	MENUEVENT(downloads),
-	MENUEVENT(save_window_size),
-	MENUEVENT(toggle_debug_rendering),
-	MENUEVENT(save_box_tree),
-
-	/* navigate menu */
-	MENUEVENT(back),
-	MENUEVENT(forward),
-	MENUEVENT(home),
-	MENUEVENT(local_history),
-	MENUEVENT(global_history),
-
-	/* help menu */
-	MENUEVENT(about),
-
-	/* sentinel */
-	{ NULL, NULL }
-};
-
-void nsbeos_attach_menu_handlers(GladeXML *xml, gpointer g)
-{
-	struct menu_events *event = menu_events;
-
-	while (event->widget != NULL)
-	{
-		beosWidget *w = glade_xml_get_widget(xml, event->widget);
-		g_signal_connect(G_OBJECT(w), "activate", event->handler, g);
-		event++;
-	}
-}
-#endif
-
 // #pragma mark - class NSThrobber
 
 class NSThrobber : public BView {
@@ -1179,26 +1047,6 @@ void nsbeos_window_update_back_forward(struct beos_scaffolding *g)
 
 	g->top_view->UnlockLooper();
 
-#warning XXX
-#if 0 /* GTK */
-	beos_widget_set_sensitive(beos_WIDGET(g->back_button),
-			history_back_available(bw->history));
-	beos_widget_set_sensitive(beos_WIDGET(g->forward_button),
-			history_forward_available(bw->history));
-
-	beos_widget_set_sensitive(beos_WIDGET(g->back_menu),
-			history_back_available(bw->history));
-	beos_widget_set_sensitive(beos_WIDGET(g->forward_menu),
-			history_forward_available(bw->history));
-
-	/* update the local history window, as well as queuing a redraw
-	 * for it.
-	 */
-	history_size(bw->history, &width, &height);
-	beos_widget_set_size_request(beos_WIDGET(g->history_window->drawing_area),
-				    width, height);
-	beos_widget_queue_draw(beos_WIDGET(g->history_window->drawing_area));
-#endif
 }
 
 void nsbeos_throb(void *p)
@@ -1213,10 +1061,6 @@ void nsbeos_throb(void *p)
 	if (!g->top_view->LockLooper())
 		return;
 
-#if 0
-	g->throbber->SetViewBitmap(nsbeos_throbber->framedata[g->throb_frame],
-		B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-#endif
 	g->throbber->SetBitmap(nsbeos_throbber->framedata[g->throb_frame]);
 	g->throbber->Invalidate();
 
@@ -1226,360 +1070,6 @@ void nsbeos_throb(void *p)
 
 }
 
-#warning XXX
-#if 0 /* GTK */
-
-gboolean nsbeos_openfile_open(beosWidget *widget, gpointer data)
-{
-	struct browser_window *bw = nsbeos_get_browser_for_gui(
-						current_model->top_level);
-	char *filename = beos_file_chooser_get_filename(
-						beos_FILE_CHOOSER(wndOpenFile));
-	char *url = malloc(strlen(filename) + sizeof("file://"));
-
-	sprintf(url, "file://%s", filename);
-
-	browser_window_navigate(bw, url, 0, true);
-
-	g_free(filename);
-	free(url);
-
-	return TRUE;
-}
-#endif
-
-#warning XXX
-#if 0 /* GTK */
-/* signal handlers for menu entries */
-#define MENUHANDLER(x) gboolean nsbeos_on_##x##_activate(beosMenuItem *widget, \
- gpointer g)
-
-MENUHANDLER(new_window)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(gw->top_level);
-	const char *url = beos_entry_get_text(beos_ENTRY(gw->url_bar));
-
-	browser_window_create(url, bw, NULL, false);
-
-	return TRUE;
-}
-
-MENUHANDLER(open_location)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	beos_widget_grab_focus(beos_WIDGET(gw->url_bar));
-
-	return TRUE;
-}
-
-MENUHANDLER(open_file)
-{
-	current_model = (struct beos_scaffolding *)g;
-	beos_dialog_run(wndOpenFile);
-
-	return TRUE;
-}
-
-MENUHANDLER(close_window)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	beos_widget_destroy(beos_WIDGET(gw->window));
-
-	return TRUE;
-}
-
-MENUHANDLER(quit)
-{
-	netsurf_quit = true;
-	return TRUE;
-}
-
-MENUHANDLER(preferences)
-{
-	beos_widget_show(beos_WIDGET(wndPreferences));
-
-	return TRUE;
-}
-
-MENUHANDLER(zoom_in)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(gw->top_level);
-	float old_scale = nsbeos_get_scale_for_gui(gw->top_level);
-
-	browser_window_set_scale(bw, old_scale + 0.05, true);
-
-	return TRUE;
-}
-
-MENUHANDLER(normal_size)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(gw->top_level);
-
-	browser_window_set_scale(bw, 1.0, true);
-
-	return TRUE;
-}
-
-MENUHANDLER(zoom_out)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(gw->top_level);
-	float old_scale = nsbeos_get_scale_for_gui(gw->top_level);
-
-	browser_window_set_scale(bw, old_scale - 0.05, true);
-
-	return TRUE;
-}
-
-MENUHANDLER(full_screen)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	if (gw->fullscreen) {
-		beos_window_unfullscreen(gw->window);
-	} else {
-		beos_window_fullscreen(gw->window);
-	}
-
-	gw->fullscreen = !gw->fullscreen;
-
-	return TRUE;
-}
-
-MENUHANDLER(menu_bar)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	if (beos_check_menu_item_get_active(beos_CHECK_MENU_ITEM(widget))) {
-		beos_widget_show(beos_WIDGET(gw->menu_bar));
-	} else {
-		beos_widget_hide(beos_WIDGET(gw->menu_bar));
-	}
-
-	return TRUE;
-}
-
-MENUHANDLER(tool_bar)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	if (beos_check_menu_item_get_active(beos_CHECK_MENU_ITEM(widget))) {
-		beos_widget_show(beos_WIDGET(gw->tool_bar));
-	} else {
-		beos_widget_hide(beos_WIDGET(gw->tool_bar));
-	}
-
-	return TRUE;
-}
-
-MENUHANDLER(status_bar)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	if (beos_check_menu_item_get_active(beos_CHECK_MENU_ITEM(widget))) {
-		beos_widget_show(beos_WIDGET(gw->status_bar));
-	} else {
-		beos_widget_hide(beos_WIDGET(gw->status_bar));
-	}
-
-	return TRUE;
-}
-
-MENUHANDLER(downloads)
-{
-	nsbeos_download_show();
-	
-	return TRUE;
-}
-
-MENUHANDLER(save_window_size)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	int x,y,w,h;
-
-	nsoption_set_int(toolbar_status_width, 
-			 beos_paned_get_position(gw->status_pane));
-	beos_window_get_position(gw->window, &x, &y);
-	beos_window_get_size(gw->window, &w, &h);
-
-	nsoption_set_int(window_x, x);
-	nsoption_set_int(window_y, y);
-	nsoption_set_int(window_width, w);
-	nsoption_set_int(window_height, h);
-
-	nsoption_write(options_file_location);
-
-	return TRUE;
-}
-
-MENUHANDLER(toggle_debug_rendering)
-{
-	html_redraw_debug = !html_redraw_debug;
-	nsbeos_reflow_all_windows();
-	return TRUE;
-}
-
-MENUHANDLER(save_box_tree)
-{
-	beosWidget *save_dialog;
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-	
-	save_dialog = beos_file_chooser_dialog_new("Save File", gw->window,
-		beos_FILE_CHOOSER_ACTION_SAVE,
-		beos_STOCK_CANCEL, beos_RESPONSE_CANCEL,
-		beos_STOCK_SAVE, beos_RESPONSE_ACCEPT,
-		NULL);
-	
-	beos_file_chooser_set_current_folder(beos_FILE_CHOOSER(save_dialog),
-		getenv("HOME") ? getenv("HOME") : "/");
-	
-	beos_file_chooser_set_current_name(beos_FILE_CHOOSER(save_dialog),
-		"boxtree.txt");
-	
-	if (beos_dialog_run(beos_DIALOG(save_dialog)) == beos_RESPONSE_ACCEPT) {
-		char *filename = beos_file_chooser_get_filename(
-			beos_FILE_CHOOSER(save_dialog));
-		FILE *fh;
-		LOG(("Saving box tree dump to %s...\n", filename));
-		
-		fh = fopen(filename, "w");
-		if (fh == NULL) {
-			warn_user("Error saving box tree dump.",
-				"Unable to open file for writing.");
-		} else {
-			struct browser_window *bw;
-			bw = nsbeos_get_browser_window(gw->top_level);
-
-			browser_window_debug_dump(bw, f);
-
-			fclose(fh);
-		}
-		
-		g_free(filename);
-	}
-	
-	beos_widget_destroy(save_dialog);
-}
-
-MENUHANDLER(stop)
-{
-	return nsbeos_window_stop_button_clicked(beos_WIDGET(widget), g);
-}
-
-MENUHANDLER(reload)
-{
-	return nsbeos_window_reload_button_clicked(beos_WIDGET(widget), g);
-}
-
-MENUHANDLER(back)
-{
-	return nsbeos_window_back_button_clicked(beos_WIDGET(widget), g);
-}
-
-MENUHANDLER(forward)
-{
-	return nsbeos_window_forward_button_clicked(beos_WIDGET(widget), g);
-}
-
-MENUHANDLER(home)
-{
-	return nsbeos_window_home_button_clicked(beos_WIDGET(widget), g);
-}
-
-MENUHANDLER(local_history)
-{
-	struct beos_scaffolding *gw = (struct beos_scaffolding *)g;
-
-	beos_widget_show(beos_WIDGET(gw->history_window->window));
-	gdk_window_raise(beos_WIDGET(gw->history_window->window)->window);
-
-	return TRUE;
-}
-
-MENUHANDLER(global_history)
-{
-	beos_widget_show(beos_WIDGET(wndHistory));
-	gdk_window_raise(beos_WIDGET(wndHistory)->window);
-
-	return TRUE;
-}
-
-MENUHANDLER(about)
-{
-	beos_widget_show(beos_WIDGET(wndAbout));
-	gdk_window_raise(beos_WIDGET(wndAbout)->window);
-	return TRUE;
-}
-
-/* signal handler functions for the local history window */
-gboolean nsbeos_history_expose_event(beosWidget *widget,
-				    GdkEventExpose *event, gpointer g)
-{
-	struct beos_history_window *hw = (struct beos_history_window *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(hw->g->top_level);
-
-	struct redraw_context ctx = {
-		.interactive = true,
-		.background_images = true,
-		.plot = &nsbeos_plotters
-	};
-
-	current_widget = widget;
-	current_drawable = widget->window;
-	current_gc = gdk_gc_new(current_drawable);
-#ifdef CAIRO_VERSION
-	current_cr = gdk_cairo_create(current_drawable);
-#endif
-	plot = nsbeos_plotters;
-
-	history_redraw(bw->history, &ctx);
-
-	g_object_unref(current_gc);
-#ifdef CAIRO_VERSION
-	cairo_destroy(current_cr);
-#endif
-	return FALSE;
-}
-
-gboolean nsbeos_history_button_press_event(beosWidget *widget,
-					GdkEventButton *event, gpointer g)
-{
-	struct beos_history_window *hw = (struct beos_history_window *)g;
-	struct browser_window *bw = nsbeos_get_browser_for_gui(hw->g->top_level);
-
-	LOG(("X=%g, Y=%g", event->x, event->y));
-
-	history_click(bw, bw->history,
-		      event->x, event->y, false);
-
-	return TRUE;
-}
-
-#define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x))
-
-static gboolean do_scroll_event(beosWidget *widget, GdkEvent *ev,
-				gpointer data)
-{
-	switch (((GdkEventScroll *)ev)->direction)
-	{
-	case GDK_SCROLL_UP:
-	case GDK_SCROLL_DOWN:
-		beos_widget_event(g_object_get_data(
-					G_OBJECT(widget), "vScroll"), ev);
-		break;
-	default:
-		beos_widget_event(g_object_get_data(
-					G_OBJECT(widget), "hScroll"), ev);
-	}
-
-	return TRUE;
-}
-#endif
 
 NSBrowserWindow *nsbeos_find_last_window(void)
 {
@@ -1731,33 +1221,6 @@ void nsbeos_attach_toplevel_view(nsbeos_scaffolding *g, BView *view)
 	}
 
 
-#warning XXX
-#if 0 /* GTK */
-	beosWidget *scrollbar;
-
-	/* Insert the viewport into the right part of our table */
-	beosTable *table = beos_TABLE(GET_WIDGET("centreTable"));
-	LOG(("Attaching viewport to scaffolding %p", g));
-	beos_table_attach_defaults(table, beos_WIDGET(vp), 0, 1, 0, 1);
-
-	/* connect our scrollbars to the viewport */
-	scrollbar = GET_WIDGET("coreScrollHorizontal");
-	beos_viewport_set_hadjustment(vp,
-		beos_range_get_adjustment(beos_RANGE(scrollbar)));
-	g_object_set_data(G_OBJECT(vp), "hScroll", scrollbar);
-	scrollbar = GET_WIDGET("coreScrollVertical");
-	beos_viewport_set_vadjustment(vp,
-		beos_range_get_adjustment(beos_RANGE(scrollbar)));
-	g_object_set_data(G_OBJECT(vp), "vScroll", scrollbar);
-	g_signal_connect(G_OBJECT(vp), "scroll_event",
-	    			G_CALLBACK(do_scroll_event), NULL);
-
-	gdk_window_set_accept_focus (beos_WIDGET(vp)->window, TRUE);
-
-	/* And set the size-request to zero to cause it to get its act together */
-	beos_widget_set_size_request(beos_WIDGET(vp), 0, 0);
-
-#endif
 }
 
 static BMenuItem *make_menu_item(const char *name, BMessage *message)
@@ -2374,157 +1837,6 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 
 	replicant_view = NULL;
 
-#warning XXX
-#if 0 /* GTK */
-	/* load the window template from the glade xml file, and extract
-	 * widget references from it for later use.
-	 */
-	g->xml = glade_xml_new(glade_file_location, "wndBrowser", NULL);
-	glade_xml_signal_autoconnect(g->xml);
-	g->window = beos_WINDOW(GET_WIDGET("wndBrowser"));
-	g->url_bar = beos_ENTRY(GET_WIDGET("URLBar"));
-	g->menu_bar = beos_MENU_BAR(GET_WIDGET("menubar"));
-	g->status_bar = beos_LABEL(GET_WIDGET("statusBar"));
-	g->tool_bar = beos_TOOLBAR(GET_WIDGET("toolbar"));
-	g->back_button = beos_TOOL_BUTTON(GET_WIDGET("toolBack"));
-	g->forward_button = beos_TOOL_BUTTON(GET_WIDGET("toolForward"));
-	g->stop_button = beos_TOOL_BUTTON(GET_WIDGET("toolStop"));
-	g->reload_button = beos_TOOL_BUTTON(GET_WIDGET("toolReload"));
-	g->back_menu = beos_MENU_ITEM(GET_WIDGET("back"));
-	g->forward_menu = beos_MENU_ITEM(GET_WIDGET("forward"));
-	g->stop_menu = beos_MENU_ITEM(GET_WIDGET("stop"));
-	g->reload_menu = beos_MENU_ITEM(GET_WIDGET("reload"));
-	g->throbber = beos_IMAGE(GET_WIDGET("throbber"));
-	g->status_pane = beos_PANED(GET_WIDGET("hpaned1"));
-
-	/* set this window's size and position to what's in the options, or
-	 * or some sensible default if they're not set yet.
-	 */
-	if (nsoption_int(window_width) > 0) {
-		beos_window_move(g->window, nsoption_int(window_x), nsoption_int(window_y));
-		beos_window_resize(g->window, nsoption_int(window_width),
-				   nsoption_int(window_height));
-	} else {
-		beos_window_set_default_size(g->window, 600, 600);
-	}
-
-	/* set the size of the hpane with status bar and h scrollbar */
-	beos_paned_set_position(g->status_pane, nsoption_int(toolbar_status_width));
-
-	/* set the URL entry box to expand, as we can't do this from within
-	 * glade because of the way it emulates toolbars.
-	 */
-	beos_tool_item_set_expand(beos_TOOL_ITEM(GET_WIDGET("toolURLBar")), TRUE);
-
-	/* disable toolbar buttons that make no sense initially. */
-	beos_widget_set_sensitive(beos_WIDGET(g->back_button), FALSE);
-	beos_widget_set_sensitive(beos_WIDGET(g->forward_button), FALSE);
-	beos_widget_set_sensitive(beos_WIDGET(g->stop_button), FALSE);
-
-	/* create the local history window to be assoicated with this browser */
-	g->history_window = malloc(sizeof(struct beos_history_window));
-	g->history_window->g = g;
-	g->history_window->window = beos_WINDOW(
-					beos_window_new(beos_WINDOW_TOPLEVEL));
-	beos_window_set_transient_for(g->history_window->window, g->window);
-	beos_window_set_default_size(g->history_window->window, 400, 400);
-	beos_window_set_title(g->history_window->window, "NetSurf History");
-	beos_window_set_type_hint(g->history_window->window,
-				GDK_WINDOW_TYPE_HINT_UTILITY);
-	g->history_window->scrolled = beos_SCROLLED_WINDOW(
-					beos_scrolled_window_new(0, 0));
-	beos_container_add(beos_CONTAINER(g->history_window->window),
-				beos_WIDGET(g->history_window->scrolled));
-
-	beos_widget_show(beos_WIDGET(g->history_window->scrolled));
-	g->history_window->drawing_area = beos_DRAWING_AREA(
-					beos_drawing_area_new());
-
-	beos_widget_set_events(beos_WIDGET(g->history_window->drawing_area),
-				GDK_EXPOSURE_MASK |
-				GDK_POINTER_MOTION_MASK |
-				GDK_BUTTON_PRESS_MASK);
-	beos_widget_modify_bg(beos_WIDGET(g->history_window->drawing_area),
-				beos_STATE_NORMAL,
-				&((GdkColor) { 0, 0xffff, 0xffff, 0xffff } ));
-	beos_scrolled_window_add_with_viewport(g->history_window->scrolled,
-				beos_WIDGET(g->history_window->drawing_area));
-	beos_widget_show(beos_WIDGET(g->history_window->drawing_area));
-
-	/* set up URL bar completion */
-	g->url_bar_completion = beos_entry_completion_new();
-	beos_entry_set_completion(g->url_bar, g->url_bar_completion);
-	beos_entry_completion_set_match_func(g->url_bar_completion,
-	    				nsbeos_completion_match, NULL, NULL);
-	beos_entry_completion_set_model(g->url_bar_completion,
-					beos_TREE_MODEL(nsbeos_completion_list));
-	beos_entry_completion_set_text_column(g->url_bar_completion, 0);
-	beos_entry_completion_set_minimum_key_length(g->url_bar_completion, 1);
-	beos_entry_completion_set_popup_completion(g->url_bar_completion, TRUE);
-	g_object_set(G_OBJECT(g->url_bar_completion),
-			"popup-set-width", TRUE,
-			"popup-single-match", TRUE,
-			NULL);
-
-	/* set up the throbber. */
-	beos_image_set_from_pixbuf(g->throbber, nsbeos_throbber->framedata[0]);
-	g->throb_frame = 0;
-
-#define CONNECT(obj, sig, callback, ptr) \
-	g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr))
-
-	/* connect history window signals to their handlers */
-	CONNECT(g->history_window->drawing_area, "expose_event",
-		nsbeos_history_expose_event, g->history_window);
-//	CONNECT(g->history_window->drawing_area, "motion_notify_event",
-//		nsbeos_history_motion_notify_event, g->history_window);
-	CONNECT(g->history_window->drawing_area, "button_press_event",
-		nsbeos_history_button_press_event, g->history_window);
-	CONNECT(g->history_window->window, "delete_event",
-		beos_widget_hide_on_delete, NULL);
-
-	/* connect signals to handlers. */
-	CONNECT(g->window, "destroy", nsbeos_window_destroy_event, g);
-
-	/* toolbar and URL bar signal handlers */
-	CONNECT(g->back_button, "clicked", nsbeos_window_back_button_clicked, g);
-	CONNECT(g->forward_button, "clicked",
-		nsbeos_window_forward_button_clicked, g);
-	CONNECT(g->stop_button, "clicked", nsbeos_window_stop_button_clicked, g);
-	CONNECT(g->reload_button, "clicked",
-		nsbeos_window_reload_button_clicked, g);
-	CONNECT(GET_WIDGET("toolHome"), "clicked",
-		nsbeos_window_home_button_clicked, g);
-	CONNECT(g->url_bar, "activate", nsbeos_window_url_activate_event, g);
-	CONNECT(g->url_bar, "changed", nsbeos_window_url_changed, g);
-
-	/* set up the menu signal handlers */
-	nsbeos_attach_menu_handlers(g->xml, g);
-
-	g->being_destroyed = 0;
-
-	g->fullscreen = false;
-
-	/* create the popup version of the menu */
-	g->popup_xml = glade_xml_new(glade_file_location, "menuPopup", NULL);
-	g->popup_menu = beos_MENU(glade_xml_get_widget(g->popup_xml, "menuPopup"));
-
-#define POPUP_ATTACH(x, y) beos_menu_item_set_submenu( \
-			beos_MENU_ITEM(glade_xml_get_widget(g->popup_xml, x)),\
-			beos_WIDGET(glade_xml_get_widget(g->xml, y)))
-
-	POPUP_ATTACH("menupopup_file", "menumain_file");
-	POPUP_ATTACH("menupopup_edit", "menumain_edit");
-	POPUP_ATTACH("menupopup_view", "menumain_view");
-	POPUP_ATTACH("menupopup_navigate", "menumain_navigate");
-	POPUP_ATTACH("menupopup_help", "menumain_help");
-
-#undef POPUP_ATTACH
-
-	/* finally, show the window. */
-	beos_widget_show(beos_WIDGET(g->window));
-
-#endif
 	return g;
 }
 
@@ -2639,14 +1951,6 @@ void gui_window_set_search_ico(hlcache_handle *ico)
 {
 }
 
-#warning XXX
-#if 0 /* GTK */
-gboolean nsbeos_scaffolding_is_busy(nsbeos_scaffolding *scaffold)
-{
-	/* We are considered "busy" if the stop button is sensitive */
-	return beos_WIDGET_SENSITIVE((beos_WIDGET(scaffold->stop_button)));
-}
-#endif
 
 void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where)
 {