Fix up RISC OS front end.

svn path=/trunk/netsurf/; revision=12545

5 files changed, 5 insertions, 10 deletions

diff --git a/desktop/history_core.h b/desktop/history_core.h
index 883ee9cea..5a75e4a95 100644
--- a/desktop/history_core.h
+++ b/desktop/history_core.h
@@ -29,6 +29,7 @@ struct hlcache_handle;
 struct history;
 struct browser_window;
 struct history_entry;
+struct redraw_context;
 
 struct history *history_create(void);
 struct history *history_clone(struct history *history);
diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c
index 0afd7799e..445797611 100644
--- a/riscos/gui/progress_bar.c
+++ b/riscos/gui/progress_bar.c
@@ -473,7 +473,6 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw,
 	int progress_ymid;
 
 	/* initialise the plotters */
-	plot = ro_plotters;
   	ro_plot_origin_x = 0;
   	ro_plot_origin_y = 0;
 
@@ -502,14 +501,14 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw,
 					redraw->box.y0 + pb->visible.y0) >> 1;
 		  	if ((clip.x0 < clip.x1) && (clip.y0 < clip.y1)) {
 				if (progress_icon) {
-			  		plot.clip(&clip);
+			  		ro_plotters.clip(&clip);
 					_swix(Tinct_Plot, _IN(2) | _IN(3) | _IN(4) | _IN(7),
 							progress_icon,
 							redraw->box.x0 - pb->offset,
 							progress_ymid - progress_height,
 							tinct_FILL_HORIZONTALLY);
 				} else {
-				  	plot.rectangle(clip.x0, clip.y0, 
+				  	ro_plotters.rectangle(clip.x0, clip.y0, 
 						       clip.x1, clip.y1,
 						       plot_style_fill_red);
 			  	}
diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c
index 1cd10e44c..e01ae3c5d 100644
--- a/riscos/gui/status_bar.c
+++ b/riscos/gui/status_bar.c
@@ -449,7 +449,6 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 	assert(sb);
 
 	/* initialise the plotters */
-	plot = ro_plotters;
 	ro_plot_origin_x = 0;
 	ro_plot_origin_y = 0;
 
@@ -487,7 +486,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 		}
 
 		/* separate the widget from the text with a line */
-		plot.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1,
+		ro_plotters.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1,
 				-redraw->box.y0 >> 1,
 				(redraw->box.x0 + sb->width - WIDGET_WIDTH) >> 1,
 				-redraw->box.y1 >> 1,
diff --git a/riscos/toolbar.c b/riscos/toolbar.c
index 263ba050c..73823394f 100644
--- a/riscos/toolbar.c
+++ b/riscos/toolbar.c
@@ -1011,8 +1011,6 @@ void ro_toolbar_redraw(wimp_draw *redraw)
 
 	assert(toolbar != NULL);
 
-	plot = ro_plotters;
-
 	error = xwimp_redraw_window(redraw, &more);
 	if (error) {
 		LOG(("xwimp_redraw_window: 0x%x: %s",
diff --git a/riscos/treeview.c b/riscos/treeview.c
index c5f1cd526..91f0c19ab 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -317,8 +317,6 @@ void ro_treeview_redraw_request(int x, int y, int width, int height,
 		wimp_draw		update;
 		osbool			more;
 
-		plot = ro_plotters;
-
 		update.w = tv->w;
 		update.box.x0 = (2 * x) + tv->origin.x;
 		update.box.y0 = (-2 * (y + height)) + tv->origin.y;
@@ -404,7 +402,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more)
 			clip.y0 = (ro_plot_origin_y - redraw->clip.y1) / 2;
 			clip.x1 = (redraw->clip.x1 - ro_plot_origin_x) / 2;
 			clip.y1 = (ro_plot_origin_y - redraw->clip.y0) / 2;
-			plot.clip(&clip);
+			ro_plotters.clip(&clip);
 	 	}
 
 		error = xwimp_get_rectangle(redraw, &more);