summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2017-04-26 10:00:51 +0100
committerVincent Sanders <vince@kyllikki.org>2017-04-26 10:00:51 +0100
commitbe7aef9231443dba644438117106f52cf3e103f9 (patch)
treee2f3e770f7b3f21f19a44160e54bba2e89b8a77e
parent1e197432f89d6cee8440b5b37a29d249c46bd502 (diff)
downloadnetsurf-be7aef9231443dba644438117106f52cf3e103f9.tar.gz
netsurf-be7aef9231443dba644438117106f52cf3e103f9.tar.bz2
update riscos frontend to remove reformat API
-rw-r--r--frontends/riscos/window.c29
1 files changed, 10 insertions, 19 deletions
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;
}
@@ -4207,18 +4211,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,