From 8dea0fe8947800aae49f4fdf243fc0b468ea15ae Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 18 Oct 2014 18:25:23 +0100 Subject: Shouldn't need to have "insider knowledge" of contents. Use the bw API. --- riscos/window.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'riscos/window.c') diff --git a/riscos/window.c b/riscos/window.c index 99010c304..b851775b3 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -2211,9 +2211,8 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu, /* Page Submenu */ - ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, h == NULL || - (content_get_type(h) != CONTENT_HTML && - content_get_type(h) != CONTENT_TEXTPLAIN)); + ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, + !browser_window_can_search(bw)); ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, h == NULL); @@ -2222,8 +2221,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu, ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, h == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_FIND_TEXT, - h == NULL || (content_get_type(h) != CONTENT_HTML && - content_get_type(h) != CONTENT_TEXTPLAIN)); + !browser_window_can_search(bw)); ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, h == NULL); -- cgit v1.2.3