summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2009-03-23 22:56:31 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2009-03-23 22:56:31 +0000
commit82aedf96001c7d0a5a72ac8fcafd11a3e28c3a93 (patch)
treeab410ed534dc131bf7ffb84b2b9be9d444f3d7a4
parent0a7e10819b40d34ce5b13e582ac057e3fe1abfe6 (diff)
downloadnetsurf-82aedf96001c7d0a5a72ac8fcafd11a3e28c3a93.tar.gz
netsurf-82aedf96001c7d0a5a72ac8fcafd11a3e28c3a93.tar.bz2
Make RISC OS front end use r6827 functions.
svn path=/trunk/netsurf/; revision=6828
-rw-r--r--riscos/menus.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/riscos/menus.c b/riscos/menus.c
index f5ad09f91..102c0e83c 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -2203,33 +2203,31 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action,
/* navigation actions */
case BROWSER_NAVIGATE_BACK:
- result = (!bw || !bw->history ||
- !history_back_available(bw->history));
+ result = browser_window_back_available(bw);
ro_gui_menu_set_entry_shaded(current_menu,
- action, result);
+ action, !result);
if ((t) && (!t->editor) &&
(t->type == THEME_BROWSER_TOOLBAR))
ro_gui_set_icon_shaded_state(
t->toolbar_handle,
- ICON_TOOLBAR_BACK, result);
+ ICON_TOOLBAR_BACK, !result);
break;
case BROWSER_NAVIGATE_FORWARD:
- result = (!bw || !bw->history ||
- !history_forward_available(bw->history));
+ result = browser_window_forward_available(bw);
ro_gui_menu_set_entry_shaded(current_menu,
- action, result);
+ action, !result);
if ((t) && (!t->editor) &&
(t->type == THEME_BROWSER_TOOLBAR))
ro_gui_set_icon_shaded_state(
t->toolbar_handle,
- ICON_TOOLBAR_FORWARD, result);
+ ICON_TOOLBAR_FORWARD, !result);
break;
case BROWSER_NAVIGATE_UP:
result = (bw && c);
if (result) {
res = url_parent(c->url, &parent);
if (res == URL_FUNC_OK) {
- res = url_compare(c->url, parent,
+ res = url_compare(c->url, parent,
false, &compare);
if (res == URL_FUNC_OK)
result = !compare;
@@ -2249,7 +2247,7 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action,
break;
case BROWSER_NAVIGATE_RELOAD:
case BROWSER_NAVIGATE_RELOAD_ALL:
- result = (bw->current_content && !bw->loading_content);
+ result = browser_window_reload_available(bw);
ro_gui_menu_set_entry_shaded(current_menu,
action, !result);
if ((t) && (!t->editor) &&
@@ -2259,9 +2257,7 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action,
ICON_TOOLBAR_RELOAD, !result);
break;
case BROWSER_NAVIGATE_STOP:
- result = (bw->loading_content || (bw->current_content &&
- (bw->current_content->status !=
- CONTENT_STATUS_DONE)));
+ result = browser_window_stop_available(bw);
ro_gui_menu_set_entry_shaded(current_menu,
action, !result);
if ((t) && (!t->editor) &&