From be7aef9231443dba644438117106f52cf3e103f9 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 26 Apr 2017 10:00:51 +0100 Subject: update riscos frontend to remove reformat API --- frontends/riscos/window.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) (limited to 'frontends') diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index 6b5089ca9..1d5c0938a 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -927,16 +927,20 @@ static void gui_window_scroll_visible(struct gui_window *g, int x0, int y0, int * \param height receives height of window * \param scaled whether to return scaled values */ - -static void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, bool scaled) +static nserror +gui_window_get_dimensions(struct gui_window *gw, + int *width, int *height, + bool scaled) { /* use the cached window sizes */ - *width = g->old_width / 2; - *height = g->old_height / 2; + *width = gw->old_width / 2; + *height = gw->old_height / 2; + if (scaled) { - *width /= g->scale; - *height /= g->scale; + *width /= gw->scale; + *height /= gw->scale; } + return NSERROR_OK; } @@ -4206,18 +4210,6 @@ void ro_gui_window_update_boxes(void) } -/** - * callback from core to reformat a window. - */ -static void riscos_window_reformat(struct gui_window *gw) -{ - if (gw != NULL) { - browser_window_reformat(gw->bw, false, - gw->old_width / 2, - gw->old_height / 2); - } -} - /** * Destroy all browser windows. */ @@ -4986,7 +4978,6 @@ static struct gui_window_table window_table = { .set_scroll = gui_window_set_scroll, .get_dimensions = gui_window_get_dimensions, .update_extent = gui_window_update_extent, - .reformat = riscos_window_reformat, .set_title = gui_window_set_title, .set_url = ro_gui_window_set_url, -- cgit v1.2.3