update RISC OS frontend to not use the depricated warn_user API

4 files changed, 16 insertions, 13 deletions

diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 485f0c943..fdae9761b 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -194,7 +194,7 @@ bool ro_gui_options_fonts_init_menu(void)
 
 	default_menu = malloc(wimp_SIZEOF_MENU(5));
 	if (!default_menu) {
-		warn_user("NoMemory", 0);
+		ro_warn_user("NoMemory", 0);
 		return false;
 	}
 	default_menu->title_data.indirected_text.text =
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index 1c9531c6d..cab7ef01b 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -153,7 +153,7 @@ void ro_gui_options_image_redraw(wimp_draw *redraw)
 	if (error) {
 		LOG("xwimp_get_icon_state: 0x%x: %s",
 				error->errnum, error->errmess);
-		warn_user("MenuError", error->errmess);
+		ro_warn_user("MenuError", error->errmess);
 		return;
 	}
 
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index 48c20fc46..b12a79588 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -100,7 +100,7 @@ bool ro_gui_options_language_ok(wimp_w w)
 				nsoption_set_charp(language, temp);
 			} else {
 				LOG("No memory to duplicate language code");
-				warn_user("NoMemory", 0);
+				ro_warn_user("NoMemory", 0);
 			}
 		}
 	}
@@ -115,7 +115,7 @@ bool ro_gui_options_language_ok(wimp_w w)
 				nsoption_set_charp(accept_language,temp);
 			} else {
 				LOG("No memory to duplicate language code");
-				warn_user("NoMemory", 0);
+				ro_warn_user("NoMemory", 0);
 			}
 		}
 	}
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index bee2231cd..e80538446 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -19,11 +19,17 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
-#include "oslib/wimpspriteop.h"
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+#include <oslib/wimpspriteop.h>
+
 #include "utils/config.h"
 #include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
+#include "riscos/gui.h"
 #include "riscos/configure/configure.h"
 #include "riscos/configure.h"
 #include "riscos/dialog.h"
@@ -34,9 +40,6 @@
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
 #include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
 
 
 #define THEME_PANE_AREA 0
@@ -175,7 +178,7 @@ void ro_gui_options_theme_finalise(wimp_w w)
 		error = xwimp_delete_window(theme_pane);
 		if (error) {
 			LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess);
-			warn_user("WimpError", error->errmess);
+			ro_warn_user("WimpError", error->errmess);
 		}
 		theme_pane = 0;
 	}
@@ -268,7 +271,7 @@ void ro_gui_options_theme_load(void)
 			toolbar_display = calloc(sizeof(struct toolbar_display), 1);
 			if (!toolbar_display) {
 				LOG("No memory for calloc()");
-				warn_user("NoMemory", 0);
+				ro_warn_user("NoMemory", 0);
 				return;
 			}
 			toolbar_display->toolbar = toolbar;
@@ -290,7 +293,7 @@ void ro_gui_options_theme_load(void)
 	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;
 	}