diff options
Diffstat (limited to 'riscos/window.c')
| -rw-r--r-- | riscos/window.c | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/riscos/window.c b/riscos/window.c index f638b349d..27fdb39fa 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1923,8 +1923,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, { error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2673,8 +2672,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_CONTENTS: error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2686,8 +2684,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_GUIDE: error = nsurl_create("http://www.netsurf-browser.org/documentation/guide", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2699,8 +2696,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_INFORMATION: error = nsurl_create("http://www.netsurf-browser.org/documentation/info", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2712,8 +2708,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_CREDITS: error = nsurl_create("about:credits", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2725,8 +2720,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_LICENCE: error = nsurl_create("about:licence", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2837,8 +2831,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, error = browser_window_navigate(bw, url, hlcache_handle_get_url(h), - BROWSER_WINDOW_DOWNLOAD | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -2851,8 +2845,9 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, if (current_menu_url != NULL) { error = nsurl_create(current_menu_url, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create( + BW_CREATE_HISTORY | + BW_CREATE_CLONE, url, hlcache_handle_get_url(h), bw, @@ -3728,7 +3723,8 @@ void ro_gui_window_toolbar_click(void *data, hlcache_handle *h = g->bw->current_content; nserror error; - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, + error = browser_window_create( + BW_CREATE_HISTORY | BW_CREATE_CLONE, NULL, NULL, g->bw, @@ -4010,8 +4006,7 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1) browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_CREATE_HISTORY, NULL, NULL, NULL); @@ -4051,8 +4046,8 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url) browser_window_navigate(g->bw, parent, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -4088,8 +4083,8 @@ void ro_gui_window_action_home(struct gui_window *g) error = browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -4114,7 +4109,7 @@ void ro_gui_window_action_new_window(struct gui_window *g) if (g == NULL || g->bw == NULL || g->bw->current_content == NULL) return; - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, + error = browser_window_create(BW_CREATE_CLONE, hlcache_handle_get_url(g->bw->current_content), NULL, g->bw, |