diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 18:34:34 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 18:34:34 +0100 |
| commit | 3a9fa29ee53bef70a0e643847acc2fb374501f70 (patch) | |
| tree | e9a8946c7655e03e4c9a9d702bbf36b1952a92df /riscos | |
| parent | caf918d2f28f600184036aef3f096024d3af62a7 (diff) | |
| download | netsurf-3a9fa29ee53bef70a0e643847acc2fb374501f70.tar.gz netsurf-3a9fa29ee53bef70a0e643847acc2fb374501f70.tar.bz2 | |
try and improve usage of browser window internals
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/dialog.c | 1 | ||||
| -rw-r--r-- | riscos/iconbar.c | 1 | ||||
| -rw-r--r-- | riscos/window.c | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/riscos/dialog.c b/riscos/dialog.c index 1c95a7099..fd854b857 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -37,6 +37,7 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" +#include "utils/nsurl.h" #include "utils/url.h" #include "utils/utils.h" #include "desktop/netsurf.h" diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 11640fe7c..f29b019a2 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -36,6 +36,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "utils/nsurl.h" #include "desktop/netsurf.h" #include "desktop/browser.h" diff --git a/riscos/window.c b/riscos/window.c index 2ad432b2e..ab4cb0c50 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -602,8 +602,6 @@ static struct gui_window *gui_window_create(struct browser_window *bw, ro_gui_window_menu_close); /* Set the window options */ - bw->window = g; - bw->scale = ((float)nsoption_int(scale)) / 100; ro_gui_window_clone_options(g, existing); ro_gui_window_update_toolbar_buttons(g); @@ -2424,7 +2422,6 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, wimp_selection *selection, menu_action action) { struct gui_window *g; - struct browser_window *bw; hlcache_handle *h; struct toolbar *toolbar; bool export; @@ -2434,8 +2431,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, g = (struct gui_window *) ro_gui_wimp_event_get_user_data(w); toolbar = g->toolbar; - bw = g->bw; - h = bw->current_content; + h = g->bw->current_content; switch (action) { case BROWSER_PAGE_INFO: @@ -2472,9 +2468,9 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, break; case BROWSER_SELECTION_SAVE: - if (browser_window_get_editor_flags(bw) & BW_EDITOR_CAN_COPY) + if (browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) ro_gui_save_prepare(GUI_SAVE_TEXT_SELECTION, NULL, - browser_window_get_selection(bw), + browser_window_get_selection(g->bw), NULL, NULL); break; |