From 153c4444543411b00fc8682bd38d6e1758a63082 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 22 Aug 2012 12:22:58 +0100 Subject: Move browser_window struct to private header. Places that shouldn't include it do, such as front end code. Frontends that have been updated to build: framebuffer gtk monkey riscos TODO: amiga atari beos cocoa windows --- riscos/dialog.c | 5 ++--- riscos/history.c | 1 + riscos/print.c | 1 + riscos/search.c | 1 + riscos/textselection.c | 5 ----- riscos/window.c | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) (limited to 'riscos') diff --git a/riscos/dialog.c b/riscos/dialog.c index ab53603dc..1fabbcb5e 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -685,11 +685,10 @@ bool ro_gui_dialog_zoom_apply(wimp_w w) { void ro_gui_dialog_prepare_zoom(struct gui_window *g) { char scale_buffer[8]; - sprintf(scale_buffer, "%.0f", g->bw->scale * 100); + sprintf(scale_buffer, "%.0f", browser_window_get_scale(g->bw) * 100); ro_gui_set_icon_string(dialog_zoom, ICON_ZOOM_VALUE, scale_buffer, true); ro_gui_set_icon_selected_state(dialog_zoom, ICON_ZOOM_FRAMES, true); - ro_gui_set_icon_shaded_state(dialog_zoom, ICON_ZOOM_FRAMES, - !(g->bw->parent)); + ro_gui_set_icon_shaded_state(dialog_zoom, ICON_ZOOM_FRAMES, true); ro_gui_current_zoom_gui = g; ro_gui_wimp_event_memorise(dialog_zoom); } diff --git a/riscos/history.c b/riscos/history.c index 00ff5d6ff..8a3b562cb 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -30,6 +30,7 @@ #include "desktop/history_core.h" #include "desktop/plotters.h" #include "riscos/dialog.h" +#include "desktop/browser_private.h" #include "desktop/options.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/print.c b/riscos/print.c index 46ceb851a..05eb8fdba 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -32,6 +32,7 @@ #include "utils/config.h" #include "content/content.h" #include "content/hlcache.h" +#include "desktop/browser_private.h" #include "desktop/options.h" #include "desktop/plotters.h" #include "riscos/dialog.h" diff --git a/riscos/search.c b/riscos/search.c index 76d333fea..db87cad8d 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -32,6 +32,7 @@ #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/gui.h" +#include "desktop/browser_private.h" #include "desktop/search.h" #include "desktop/selection.h" #include "riscos/dialog.h" diff --git a/riscos/textselection.c b/riscos/textselection.c index c5a42b548..96c3e2c90 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -498,8 +498,6 @@ bool ro_gui_save_clipboard(const char *path) void ro_gui_selection_dragging(wimp_message *message) { wimp_full_message_dragging *drag = (wimp_full_message_dragging*)message; - struct browser_window *bw; - hlcache_handle *h; struct gui_window *g; os_coord pos; @@ -517,9 +515,6 @@ void ro_gui_selection_dragging(wimp_message *message) if (!ro_gui_window_to_window_pos(g, drag->pos.x, drag->pos.y, &pos)) return; - bw = g->bw; - h = bw->current_content; - drag_claimed = false; } diff --git a/riscos/window.c b/riscos/window.c index 085e02a0e..b7fffd66b 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -45,7 +45,7 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "css/css.h" -#include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/cookies.h" #include "desktop/scrollbar.h" #include "desktop/frames.h" -- cgit v1.2.3