update RISC OS frontend to not use the depricated warn_user API

1 files changed, 38 insertions, 38 deletions

diff --git a/riscos/wimp.c b/riscos/wimp.c
index 93fedc3dc..19e5aa7d4 100644
--- a/riscos/wimp.c
+++ b/riscos/wimp.c
@@ -105,7 +105,7 @@ void ro_gui_wimp_cache_furniture_sizes(wimp_w w)
 	error = xwimpextend_get_furniture_sizes(&furniture_sizes);
 	if (error) {
 		LOG("xwimpextend_get_furniture_sizes: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 }
 
@@ -125,13 +125,13 @@ bool ro_gui_wimp_read_eig_factors(os_mode mode, int *xeig, int *yeig)
 	error = xos_read_mode_variable(mode, os_MODEVAR_XEIG_FACTOR, xeig, 0);
 	if (error) {
 		LOG("xos_read_mode_variable: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("MiscError", error->errmess);
+		ro_warn_user("MiscError", error->errmess);
 		return false;
 	}
 	error = xos_read_mode_variable(mode, os_MODEVAR_YEIG_FACTOR, yeig, 0);
 	if (error) {
 		LOG("xos_read_mode_variable: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("MiscError", error->errmess);
+		ro_warn_user("MiscError", error->errmess);
 		return false;
 	}
 	return true;
@@ -198,14 +198,14 @@ void ro_gui_force_redraw_icon(wimp_w w, wimp_i i)
 	error = xwimp_get_icon_state(&ic);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 	error = xwimp_force_redraw(w, ic.icon.extent.x0, ic.icon.extent.y0,
 			ic.icon.extent.x1, ic.icon.extent.y1);
 	if (error) {
 		LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 }
 
@@ -237,7 +237,7 @@ const char *ro_gui_get_icon_string(wimp_w w, wimp_i i)
 	error = xwimp_get_icon_state(&ic);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return NULL;
 	}
 	itext = (ic.icon.flags & wimp_ICON_INDIRECTED)
@@ -294,7 +294,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8)
 	error = xwimp_get_icon_state(&ic);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		goto exit;
 	}
 
@@ -327,7 +327,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8)
 			error = xwimp_get_caret_position(&caret);
 			if (error) {
 				LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess);
-				warn_user("WimpError", error->errmess);
+				ro_warn_user("WimpError", error->errmess);
 				goto exit;
 			}
 			if ((caret.w == w) && (caret.i == i)) {
@@ -338,7 +338,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8)
 						caret.pos.y, -1, caret.index);
 				if (error) {
 					LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
-					warn_user("WimpError", error->errmess);
+					ro_warn_user("WimpError", error->errmess);
 				}
 			}
 		}
@@ -447,7 +447,7 @@ void ro_gui_set_icon_selected_state(wimp_w w, wimp_i i, bool state)
 			(state ? wimp_ICON_SELECTED : 0), wimp_ICON_SELECTED);
 	if (error) {
 		LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 }
 
@@ -466,7 +466,7 @@ bool ro_gui_get_icon_selected_state(wimp_w w, wimp_i i)
 	error = xwimp_get_icon_state(&ic);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return false;
 	}
 	return ((ic.icon.flags & wimp_ICON_SELECTED) != 0);
@@ -492,7 +492,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state)
 			(state ? wimp_ICON_SHADED : 0), wimp_ICON_SHADED);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 	if (!state)
 		return;
@@ -501,7 +501,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state)
 	error = xwimp_get_caret_position(&caret);
 	if (error) {
 		LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 	if ((caret.w != w) || (caret.i != i))
@@ -513,7 +513,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state)
 	error = xwimp_set_caret_position((wimp_w)-1, (wimp_i)-1, -1, -1, -1, -1);
 	if (error) {
 		LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 }
@@ -554,7 +554,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state)
 			(state ? wimp_ICON_DELETED : 0), wimp_ICON_DELETED);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 	if (!state)
 		return;
@@ -563,7 +563,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state)
 	error = xwimp_get_caret_position(&caret);
 	if (error) {
 		LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 	if ((caret.w != w) || (caret.i != i))
@@ -575,7 +575,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state)
 	error = xwimp_set_caret_position((wimp_w)-1, (wimp_i)-1, -1, -1, -1, -1);
 	if (error) {
 		LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 }
@@ -611,7 +611,7 @@ void ro_gui_set_icon_button_type(wimp_w w, wimp_i i, int type)
 			(type << wimp_ICON_BUTTON_TYPE_SHIFT));
 	if (error) {
 		LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 	}
 }
 
@@ -636,7 +636,7 @@ void ro_gui_set_icon_sprite(wimp_w w, wimp_i i, osspriteop_area *area,
 	error = xwimp_get_icon_state(&ic);
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 
@@ -673,7 +673,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text)
 	error = xwimp_get_window_info_header_only((wimp_window_info *)&window);
 	if (error) {
 		LOG("xwimp_get_window_info: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 
@@ -700,7 +700,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text)
 	error = xwimp_force_redraw_title(w);
 	if (error) {
 		LOG("xwimp_force_redraw_title: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 
@@ -727,7 +727,7 @@ bool ro_gui_set_caret_first(wimp_w w)
 	error = xwimp_get_window_state(&win_state);
 	if (error) {
 		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return false;
 	}
 	if (!(win_state.flags & wimp_WINDOW_OPEN))
@@ -738,7 +738,7 @@ bool ro_gui_set_caret_first(wimp_w w)
 	error = xwimp_get_window_info_header_only((wimp_window_info *)&window);
 	if (error) {
 		LOG("xwimp_get_window_info: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return false;
 	}
 
@@ -749,7 +749,7 @@ bool ro_gui_set_caret_first(wimp_w w)
 		error = xwimp_get_icon_state(&state);
 		if (error) {
 			LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("WimpError", error->errmess);
+			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
 
@@ -766,7 +766,7 @@ bool ro_gui_set_caret_first(wimp_w w)
 				strlen(state.icon.data.indirected_text.text));
 		if (error) {
 			LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("WimpError", error->errmess);
+			ro_warn_user("WimpError", error->errmess);
 		}
 		return true;
 	}
@@ -792,17 +792,17 @@ osspriteop_area *ro_gui_load_sprite_file(const char *pathname)
 			&obj_type, 0, 0, &len, 0, 0);
 	if (error) {
 		LOG("xosfile_read_stamped_no_path: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("MiscError", error->errmess);
+		ro_warn_user("MiscError", error->errmess);
 		return 0;
 	}
 	if (obj_type != fileswitch_IS_FILE) {
-		warn_user("FileError", pathname);
+		ro_warn_user("FileError", pathname);
 		return 0;
 	}
 
 	area = malloc(len + 4);
 	if (!area) {
-		warn_user("NoMemory", 0);
+		ro_warn_user("NoMemory", 0);
 		return 0;
 	}
 
@@ -815,7 +815,7 @@ osspriteop_area *ro_gui_load_sprite_file(const char *pathname)
 			area, pathname);
 	if (error) {
 		LOG("xosspriteop_load_sprite_file: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("MiscError", error->errmess);
+		ro_warn_user("MiscError", error->errmess);
 		free(area);
 		return 0;
 	}
@@ -845,7 +845,7 @@ bool ro_gui_wimp_sprite_exists(const char *sprite)
 	if (error) {
 		if (error->errnum != error_SPRITE_OP_DOESNT_EXIST) {
 			LOG("xwimpspriteop_select_sprite: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("MiscError", error->errmess);
+			ro_warn_user("MiscError", error->errmess);
 		}
 		return false;
 	}
@@ -918,7 +918,7 @@ bool ro_gui_wimp_get_sprite_dimensions(osspriteop_area *area, char *sprite,
 			*height = dimensions.y;
 	} else if (error->errnum != error_SPRITE_OP_DOESNT_EXIST) {
 		LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("MiscError", error->errmess);
+		ro_warn_user("MiscError", error->errmess);
 		return false;
 	}
 
@@ -943,7 +943,7 @@ void ro_gui_user_redraw(wimp_draw *redraw, bool user_fill,
 	error = xwimp_redraw_window(redraw, &more);
 	if (error) {
 		LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 	while (more) {
@@ -953,14 +953,14 @@ void ro_gui_user_redraw(wimp_draw *redraw, bool user_fill,
 					os_ACTION_OVERWRITE, 0, 0);
 			if (error) {
 				LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess);
-				warn_user("MiscError", error->errmess);
+				ro_warn_user("MiscError", error->errmess);
 			}
 			os_clg();
 		}
 		error = xwimp_get_rectangle(redraw, &more);
 		if (error) {
 			LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("WimpError", error->errmess);
+			ro_warn_user("WimpError", error->errmess);
 			return;
 		}
 	}
@@ -987,7 +987,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask,
 	error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage);
 	if (error) {
 		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 
@@ -1000,7 +1000,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask,
 	error = xwimp_open_window_nested_with_flags(&state, parent, linkage);
 	if (error) {
 		LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
 
@@ -1008,7 +1008,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask,
 		error = xwimp_close_window(w);
 		if (error) {
 			LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("WimpError", error->errmess);
+			ro_warn_user("WimpError", error->errmess);
 			return;
 		}
 	}
@@ -1030,7 +1030,7 @@ bool ro_gui_wimp_check_window_furniture(wimp_w w, wimp_window_flags mask)
 	error = xwimp_get_window_state(&state);
 	if (error) {
 		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
-		warn_user("WimpError", error->errmess);
+		ro_warn_user("WimpError", error->errmess);
 		return false;
 	}
 	return state.flags & mask;