split gui operations into core and window and move more operations into tables

1 files changed, 2 insertions, 8 deletions

diff --git a/riscos/gui.c b/riscos/gui.c
index ee4c59105..2854744df 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -840,14 +840,6 @@ static bool nslog_stream_configure(FILE *fptr)
 static struct gui_table riscos_gui_table = {
 	.poll = gui_poll,
 	.quit = gui_quit,
-
-	.window_create = gui_window_create,
-	.window_destroy = gui_window_destroy,
-
-	.window_set_title = gui_window_set_title,
-	.window_set_url = gui_window_set_url,
-	.window_start_throbber = gui_window_start_throbber,
-	.window_stop_throbber = gui_window_stop_throbber,
 };
 
 
@@ -905,6 +897,8 @@ int main(int argc, char** argv)
 	}
 
 	/* common initialisation */
+	riscos_gui_table.window = riscos_gui_window_table;
+
 	ret = netsurf_init(path, &riscos_gui_table);
 	if (ret != NSERROR_OK) {
 		die("NetSurf failed to initialise");