diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2016-04-26 15:16:33 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2016-04-26 15:16:33 +0100 |
| commit | 8fd04922cc25bfd2205881fc5d4220c84b2c6fe0 (patch) | |
| tree | 807795da126c6d1a7617007016c8cd05ba90e4a3 /riscos/configure/con_theme.c | |
| parent | 6a36d4ec2b6fd8ac52da2c3883b4776aec14ba2d (diff) | |
| download | netsurf-8fd04922cc25bfd2205881fc5d4220c84b2c6fe0.tar.gz netsurf-8fd04922cc25bfd2205881fc5d4220c84b2c6fe0.tar.bz2 | |
update RISC OS frontend to not use the depricated warn_user API
Diffstat (limited to 'riscos/configure/con_theme.c')
| -rw-r--r-- | riscos/configure/con_theme.c | 21 |
1 files changed, 12 insertions, 9 deletions
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; } |