6 files changed, 17 insertions, 19 deletions
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index df2de0d4c..05ec8550b 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -36,8 +36,7 @@ struct atari_cookie_manager_s atari_cookie_manager;
 
 
 /* Setup Atari Treeview Callbacks: */
-static nserror atari_cookie_manager_init_phase2(struct core_window *cw,
-				struct core_window_callback_table * default_callbacks);
+static nserror atari_cookie_manager_init_phase2(struct core_window *cw);
 static void atari_cookie_manager_finish(struct core_window *cw);
 static void atari_cookie_manager_keypress(struct core_window *cw,
 												uint32_t ucs4);
@@ -60,11 +59,10 @@ static struct atari_treeview_callbacks atari_cookie_manager_treeview_callbacks =
 
 
 static nserror
-atari_cookie_manager_init_phase2(struct core_window *cw,
-                                 struct core_window_callback_table *cb_t)
+atari_cookie_manager_init_phase2(struct core_window *cw)
 {
 	NSLOG(netsurf, INFO, "cw %p", cw);
-	return(cookie_manager_init(cb_t, cw));
+	return(cookie_manager_init(cw));
 }
 
 
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 3b324f507..3e4893bb0 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -66,6 +66,7 @@
 #include "atari/filetype.h"
 #include "atari/bitmap.h"
 #include "atari/font.h"
+#include "atari/treeview.h"
 #include "cflib.h"
 
 static bool atari_quit = false;
@@ -1107,6 +1108,7 @@ int main(int argc, char** argv)
     struct netsurf_table atari_table = {
 	.misc = &atari_misc_table,
 	.window = &atari_window_table,
+	.corewindow = atari_core_window_table,
 	.clipboard = &atari_clipboard_table,
 	.download = atari_download_table,
 	.fetch = &atari_fetch_table,
diff --git a/frontends/atari/history.c b/frontends/atari/history.c
index ec602684f..100d1a192 100644
--- a/frontends/atari/history.c
+++ b/frontends/atari/history.c
@@ -36,11 +36,10 @@ struct atari_global_history_s atari_global_history;
 /* Setup Atari Treeview Callbacks: */
 
 static nserror
-atari_global_history_init_phase2(struct core_window *cw,
-				 struct core_window_callback_table *cb_t)
+atari_global_history_init_phase2(struct core_window *cw)
 {
 	NSLOG(netsurf, INFO, "cw %p", cw);
-	return(global_history_init(cb_t, cw));
+	return(global_history_init(cw));
 }
 
 static void atari_global_history_finish(struct core_window *cw)
diff --git a/frontends/atari/hotlist.c b/frontends/atari/hotlist.c
index 3a54c98eb..920490b7e 100644
--- a/frontends/atari/hotlist.c
+++ b/frontends/atari/hotlist.c
@@ -47,8 +47,7 @@ const char *tree_hotlist_path;
 struct atari_hotlist hl;
 
 /* Setup Atari Treeview Callbacks: */
-static nserror atari_hotlist_init_phase2(struct core_window *cw,
-					 struct core_window_callback_table * default_callbacks);
+static nserror atari_hotlist_init_phase2(struct core_window *cw);
 static void atari_hotlist_finish(struct core_window *cw);
 static void atari_hotlist_keypress(struct core_window *cw,
 				   uint32_t ucs4);
@@ -69,11 +68,10 @@ static struct atari_treeview_callbacks atari_hotlist_treeview_callbacks = {
 	.gemtk_user_func = handle_event
 };
 
-static nserror atari_hotlist_init_phase2(struct core_window *cw,
-					 struct core_window_callback_table *cb_t)
+static nserror atari_hotlist_init_phase2(struct core_window *cw)
 {
 	NSLOG(netsurf, INFO, "cw:%p", cw);
-	return hotlist_manager_init(cb_t, cw);
+	return hotlist_manager_init(cw);
 }
 
 static void atari_hotlist_finish(struct core_window *cw)
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 6ab09991a..77c980f04 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -531,15 +531,16 @@ atari_treeview_drag_status(struct core_window *cw, core_window_drag_status ds)
 /**
  * Declare Core Window Callbacks:
  */
-static struct core_window_callback_table cw_t = {
+static struct core_window_table cw_t = {
 	.invalidate = atari_treeview_invalidate_area,
-	.update_size = atari_treeview_update_size,
+	.set_extent = atari_treeview_update_size,
 	.set_scroll = atari_treeview_set_scroll,
 	.get_scroll = atari_treeview_get_scroll,
-	.get_window_dimensions = atari_treeview_get_window_dimensions,
+	.get_dimensions = atari_treeview_get_window_dimensions,
 	.drag_status = atari_treeview_drag_status
 };
 
+struct core_window_table *atari_core_window_table = &cw_t;
 
 /* exported interface documented in atari/treeview.h */
 struct core_window *
@@ -586,7 +587,7 @@ atari_treeview_create(GUIWIN *win, struct atari_treeview_callbacks * callbacks,
 	/* event handlers of the treeview: */
 	/* It would be more simple to not pass around the callbacks */
 	/* but the treeview constructor requires them for initialization...  */
-	nserror err = tv->io->init_phase2((struct core_window *)tv, &cw_t);
+	nserror err = tv->io->init_phase2((struct core_window *)tv);
 	if (err != NSERROR_OK) {
 		free(tv);
 		tv = NULL;
diff --git a/frontends/atari/treeview.h b/frontends/atari/treeview.h
index fe267b122..59d718478 100644
--- a/frontends/atari/treeview.h
+++ b/frontends/atari/treeview.h
@@ -22,7 +22,7 @@
 #include "atari/gui.h"
 #include "atari/gemtk/gemtk.h"
 
-struct core_window_callback_table;
+extern struct core_window_table *atari_core_window_table;
 
 /**
  * Default AES Window widgets for a treeview window, can be passed to
@@ -50,7 +50,7 @@ struct atari_treeview_window;
  */
 
 /** \todo atari add drag_status callback */
-typedef nserror (*atari_treeview_init2_callback)(struct core_window *cw, struct core_window_callback_table * default_callbacks);
+typedef nserror (*atari_treeview_init2_callback)(struct core_window *cw);
 typedef void (*atari_treeview_finish_callback)(struct core_window *cw);
 typedef void (*atari_treeview_keypress_callback)(struct core_window *cw, uint32_t ucs4);
 typedef void (*atari_treeview_mouse_action_callback)(struct core_window *cw, browser_mouse_state mouse, int x, int y);