From 3ebf60d9fcbde65dee4cd70d02aba97d20e5d21e Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Fri, 6 Jan 2006 21:25:34 +0000 Subject: [project @ 2006-01-06 21:25:34 by rjw] Simplify code and make tree windows defined in the templates. svn path=/import/netsurf/; revision=1999 --- riscos/global_history.c | 53 ++++--------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) (limited to 'riscos/global_history.c') diff --git a/riscos/global_history.c b/riscos/global_history.c index e87577ef9..a42ee148d 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -53,39 +53,6 @@ static void ro_gui_global_history_initialise_node(const char *title, static struct node *ro_gui_global_history_find(const char *url); -/* A basic window for the history -*/ -static wimp_window history_window_definition = { - {0, 0, 600, 800}, - 0, - 0, - wimp_TOP, - wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_MOVEABLE | wimp_WINDOW_BACK_ICON | - wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | - wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_SIZE_ICON | - wimp_WINDOW_VSCROLL | wimp_WINDOW_IGNORE_XEXTENT | - wimp_WINDOW_IGNORE_YEXTENT, - wimp_COLOUR_BLACK, - wimp_COLOUR_LIGHT_GREY, - wimp_COLOUR_LIGHT_GREY, - wimp_COLOUR_WHITE, - wimp_COLOUR_DARK_GREY, - wimp_COLOUR_MID_LIGHT_GREY, - wimp_COLOUR_CREAM, - 0, - {0, -16384, 16384, 0}, - wimp_ICON_TEXT | wimp_ICON_INDIRECTED | wimp_ICON_HCENTRED | - wimp_ICON_VCENTRED, - wimp_BUTTON_DOUBLE_CLICK_DRAG << wimp_ICON_BUTTON_TYPE_SHIFT, - wimpspriteop_AREA, - 1, - 1, - {""}, - 0, - {} -}; - - /* The history window, toolbar and plot origins */ static wimp_w global_history_window; @@ -102,22 +69,10 @@ void ro_gui_global_history_initialise(void) { struct url_content **url_block; int i = 0; - /* Create our window - */ - title = messages_get("GlobalHistory"); - history_window_definition.title_data.indirected_text.text = - strdup(title); - history_window_definition.title_data.indirected_text.validation = - (char *) -1; - history_window_definition.title_data.indirected_text.size = - strlen(title); - error = xwimp_create_window(&history_window_definition, - &global_history_window); - if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); - die(error->errmess); - } + /* create our window */ + global_history_window = ro_gui_dialog_create("tree"); + ro_gui_set_window_title(global_history_window, + messages_get("GlobalHistory")); ro_gui_wimp_event_register_redraw_window(global_history_window, ro_gui_tree_redraw); ro_gui_wimp_event_register_open_window(global_history_window, -- cgit v1.2.3