diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2006-01-08 01:51:33 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2006-01-08 01:51:33 +0000 |
commit | 745deb7a9d4bf26a6339a297c3c06bb12f5cc102 (patch) | |
tree | 21fce77c94096ea7a9297a67edde9857492338d4 /riscos/menus.c | |
parent | 5eb7692b8ff2a0b226fa56ee4bb3c2d8f8e98044 (diff) | |
download | netsurf-745deb7a9d4bf26a6339a297c3c06bb12f5cc102.tar.gz netsurf-745deb7a9d4bf26a6339a297c3c06bb12f5cc102.tar.bz2 |
[project @ 2006-01-08 01:51:33 by jmb]
Make data file locations user-configurable (no UI for this as yet)
Reduce intrusiveness of ncos modifications
Fix GTK build
Remove Cookies file details from Messages (this data never belonged in there anyway)
Make gui_init more robust against memory exhaustion.
svn path=/import/netsurf/; revision=2014
Diffstat (limited to 'riscos/menus.c')
-rw-r--r-- | riscos/menus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index 8c3ea401f..59e41e230 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -520,7 +520,7 @@ void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i) { warn_user("MenuError", error->errmess); return; } - + ro_gui_menu_create(menu, state.visible.x0 + icon_state.icon.extent.x1 + 64, state.visible.y1 + icon_state.icon.extent.y1 - @@ -559,7 +559,7 @@ void ro_gui_menu_closed(bool cleanup) { the text doesn't remain highlighted */ if (ro_gui_menu_search_window_menu) ro_gui_search_end(dialog_search); - + if (tree) ro_gui_tree_menu_closed(tree); } @@ -605,7 +605,7 @@ void ro_gui_menu_selection(wimp_selection *selection) { if (!current_menu) return assert(current_menu_window); - + /* get the menu entry and associated action */ menu_entry = ¤t_menu->entries[selection->items[0]]; for (i = 1; selection->items[i] != -1; i++) @@ -932,7 +932,7 @@ void ro_gui_menu_prepare_languages(bool accept, const char *lang) for (entry = menu->entries; entry; entry = entry->next) { if (!accept) { snprintf(path_buf, sizeof path_buf, - "<NetSurf$Dir>.Resources.%.2s", + "NetSurf:Resources.%.2s", entry->entry_key + offset); entry->menu_entry->icon_flags |= is_dir(path_buf) ? @@ -1249,7 +1249,7 @@ void ro_gui_menu_define_menu_add(struct menu_definition *definition, */ void ro_gui_menu_init_structure(wimp_menu *menu, int entries) { int i; - + menu->title_fg = wimp_COLOUR_BLACK; menu->title_bg = wimp_COLOUR_LIGHT_GREY; menu->work_fg = wimp_COLOUR_BLACK; |