From c8496df3df7d059528f2d5e735be5c55bfa75ef6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 11 Jan 2014 22:34:12 +0000 Subject: move window creation and destruction into table --- gtk/gui.c | 6 ++++-- gtk/window.c | 9 +++++---- gtk/window.h | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'gtk') diff --git a/gtk/gui.c b/gtk/gui.c index da602e189..c94b9c836 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -1133,8 +1133,10 @@ bool path_add_part(char *path, int length, const char *newpart) static struct gui_table nsgtk_gui_table = { - .poll = &gui_poll, - .quit = &gui_quit, + .poll = gui_poll, + .quit = gui_quit, + .window_create = gui_window_create, + .window_destroy = gui_window_destroy, }; /** diff --git a/gtk/window.c b/gtk/window.c index 8f05c3799..aabaacbb8 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -655,10 +655,11 @@ static void window_destroy(GtkWidget *widget, gpointer data) browser_window_destroy(gw->bw); } -/* Core interface docuemnted in desktop/gui.h to create a gui_window */ -struct gui_window *gui_create_browser_window(struct browser_window *bw, - struct browser_window *clone, - bool new_tab) +/* Core interface documented in desktop/gui.h to create a gui_window */ +struct gui_window * +gui_window_create(struct browser_window *bw, + struct browser_window *clone, + bool new_tab) { struct gui_window *g; /**< what we're creating to return */ GError* error = NULL; diff --git a/gtk/window.h b/gtk/window.h index 2def42dd5..9ff036e85 100644 --- a/gtk/window.h +++ b/gtk/window.h @@ -48,5 +48,7 @@ struct gui_window *nsgtk_window_iterate(struct gui_window *g); GtkWidget *nsgtk_window_get_tab(struct gui_window *g); void nsgtk_window_set_tab(struct gui_window *g, GtkWidget *w); +struct gui_window *gui_window_create(struct browser_window *bw, struct browser_window *clone, bool new_tab); +void gui_window_destroy(struct gui_window *g); #endif /* NETSURF_GTK_WINDOW_H */ -- cgit v1.2.3