diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-06-18 20:11:21 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-06-18 20:11:21 +0100 |
| commit | 18f7d29a192536834ab727981b13958317c30d93 (patch) | |
| tree | 7e157459da61d23b4aebc18be41cb8672f46f411 /riscos/window.c | |
| parent | f432efa2b170c4f7eced378af2e4f80df560e641 (diff) | |
| parent | 6c17aa78a7cae12edd12ff7d6ad543302462c585 (diff) | |
| download | netsurf-18f7d29a192536834ab727981b13958317c30d93.tar.gz netsurf-18f7d29a192536834ab727981b13958317c30d93.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'riscos/window.c')
| -rw-r--r-- | riscos/window.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/riscos/window.c b/riscos/window.c index 164075d0b..772a0d1b1 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -53,7 +53,6 @@ #include "desktop/hotlist.h" #include "desktop/mouse.h" #include "desktop/plotters.h" -#include "desktop/selection.h" #include "desktop/textinput.h" #include "desktop/thumbnail.h" #include "desktop/tree.h" @@ -70,7 +69,7 @@ #include "riscos/help.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/oslib_pre7.h" #include "riscos/save.h" #include "riscos/content-handlers/sprite.h" @@ -522,7 +521,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, /* Add in a toolbar and status bar */ g->status_bar = ro_gui_status_bar_create(g->window, - nsoption_int(toolbar_status_width)); + nsoption_int(toolbar_status_size)); g->toolbar = ro_toolbar_create(NULL, g->window, THEME_STYLE_BROWSER_TOOLBAR, TOOLBAR_FLAGS_NONE, &ro_gui_window_toolbar_callbacks, g, @@ -4713,7 +4712,7 @@ void ro_gui_window_default_options(struct browser_window *bw) ro_toolbar_get_display_throbber(gui->toolbar)); } if (gui->status_bar != NULL) - nsoption_set_int(toolbar_status_width, + nsoption_set_int(toolbar_status_size, ro_gui_status_bar_get_width(gui->status_bar)); } |