[project @ 2004-06-21 15:25:35 by bursa]

Remove obsolete files and some dead code.

svn path=/import/netsurf/; revision=988

7 files changed, 7 insertions, 30 deletions

diff --git a/desktop/browser.h b/desktop/browser.h
index 34f759102..9a2aab732 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -50,13 +50,6 @@ struct browser_window
 	bool history_add;
 	/** Start time of fetching loading_content. */
 	clock_t time0;
-
-
-#ifdef WITH_FRAMES
-  struct browser_window *parent;
-  unsigned int no_children;
-  struct browser_window **children;
-#endif
 };
 
 
diff --git a/makefile b/makefile
index f45560aa8..100174d36 100644
--- a/makefile
+++ b/makefile
@@ -24,7 +24,7 @@ OBJECTS_COMMON += imagemap.o loginlist.o options.o		# desktop/
 
 OBJECTS_RISCOS = $(OBJECTS_COMMON)
 OBJECTS_RISCOS += browser.o netsurf.o version.o			# desktop/
-OBJECTS_RISCOS += 401login.o constdata.o debugwin.o \
+OBJECTS_RISCOS += 401login.o debugwin.o \
 	dialog.o download.o draw.o filetype.o font.o gif.o \
 	gifread.o gui.o help.o history.o htmlinstance.o \
 	htmlredraw.o jpeg.o menus.o mouseactions.o plugin.o \
@@ -40,7 +40,7 @@ OBJECTS_DEBUG += gif.o gifread.o jpeg.o png.o save_complete.o schedule.o \
 OBJECTS_DEBUGRO = $(OBJECTS_COMMON)
 OBJECTS_DEBUGRO += netsurfd.o					# debug/
 OBJECTS_DEBUGRO += version.o					# desktop/
-OBJECTS_DEBUGRO += constdata.o draw.o filetype.o font.o \
+OBJECTS_DEBUGRO += draw.o filetype.o font.o \
 	gif.o gifread.o jpeg.o png.o save_complete.o schedule.o \
 	sprite.o theme.o toolbar.o wimp.o			# riscos/
 
diff --git a/riscos/dialog.c b/riscos/dialog.c
index 74af5d21c..ff531a305 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -18,7 +18,6 @@
 #include "oslib/wimp.h"
 #include "netsurf/utils/config.h"
 #include "netsurf/desktop/netsurf.h"
-#include "netsurf/riscos/constdata.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/options.h"
 #include "netsurf/riscos/theme.h"
@@ -440,7 +439,9 @@ void ro_gui_dialog_click_config_th(wimp_pointer *pointer)
 			os_cli("Filer_OpenDir " THEMES_DIR);
 			break;
 		case ICON_CONFIG_TH_GET:
-			browser_window_create(THEMES_URL, NULL);
+			browser_window_create(
+					"http://netsurf.sourceforge.net/themes/",
+					NULL);
 			break;
 	}
 }
diff --git a/riscos/gui.c b/riscos/gui.c
index 8dae522f9..7ce5a3f89 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -36,7 +36,6 @@
 #include "netsurf/render/font.h"
 #include "netsurf/render/form.h"
 #include "netsurf/render/html.h"
-#include "netsurf/riscos/constdata.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/help.h"
 #include "netsurf/riscos/options.h"
@@ -670,11 +669,7 @@ void ro_gui_close_window_request(wimp_close *close)
 	g = ro_lookup_gui_from_w(close->w);
 
 	if (g) {
-		browser_window_destroy(g->data.browser.bw
-#ifdef WITH_FRAMES
-				, true
-#endif
-				);
+		browser_window_destroy(g->data.browser.bw);
 	} else
 		ro_gui_dialog_close(close->w);
 }
diff --git a/riscos/menus.c b/riscos/menus.c
index f80ed673d..c2cc43b85 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -17,7 +17,6 @@
 #include "oslib/os.h"
 #include "oslib/wimp.h"
 #include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/constdata.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/help.h"
 #include "netsurf/riscos/theme.h"
diff --git a/riscos/window.c b/riscos/window.c
index 738428314..27fe916a3 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -22,7 +22,6 @@
 #include "oslib/wimpspriteop.h"
 #include "netsurf/css/css.h"
 #include "netsurf/utils/config.h"
-#include "netsurf/riscos/constdata.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/options.h"
 #include "netsurf/riscos/theme.h"
@@ -900,11 +899,7 @@ bool ro_gui_window_keypress(gui_window *g, int key, bool toolbar)
 			return true;
 
 		case wimp_KEY_CONTROL + wimp_KEY_F2:	/* Close window. */
-			browser_window_destroy(g->data.browser.bw
-#ifdef WITH_FRAMES
-			, true
-#endif
-			);
+			browser_window_destroy(g->data.browser.bw);
 			return true;
 
 		case wimp_KEY_F3:
diff --git a/utils/config.h b/utils/config.h
index d7926a6bf..4c7e55f4a 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -28,18 +28,12 @@
 #define WITH_SPRITE
 #endif
 
-/* Frames */
-#undef WITH_FRAMES
-
 /* HTTP Auth */
 #define WITH_AUTH
 
 /* Cookies */
 #define WITH_COOKIES
 
-/* About page */
-#define WITH_ABOUT
-
 #ifdef riscos
 /* Plugin module */
 #define WITH_PLUGIN