- Teached ro_gui_set_icon_string() and ro_gui_get_icon_string() about the difference between direct and indirect icons.

- ro_gui_get_icon_string(): 
    - Constify return value of ro_gui_get_icon_string() as you really shouldn't change its contents via this pointer.
    - Enfore NUL string termination as return value (instead of other control char termination) 
- Merged ro_gui_set_icon_string_le() into ro_gui_set_icon_string() by adding ro_gui_set_icon_string() and extra to_utf8 parameter.
- ro_gui_strncmp(): added

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

1 files changed, 2 insertions, 3 deletions

diff --git a/riscos/wimp.h b/riscos/wimp.h
index 829bd0cd8..a1672ae67 100644
--- a/riscos/wimp.h
+++ b/riscos/wimp.h
@@ -43,9 +43,8 @@ void ro_convert_pixels_to_os_units(os_coord *pixels, os_mode mode);
 
 #define ro_gui_redraw_icon(w, i) xwimp_set_icon_state(w, i, 0, 0)
 void ro_gui_force_redraw_icon(wimp_w w, wimp_i i);
-char *ro_gui_get_icon_string(wimp_w w, wimp_i i);
-void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text);
-void ro_gui_set_icon_string_le(wimp_w w, wimp_i i, const char *text);
+const char *ro_gui_get_icon_string(wimp_w w, wimp_i i);
+void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8);
 
 void ro_gui_set_icon_integer(wimp_w w, wimp_i i, int value);
 void ro_gui_set_icon_decimal(wimp_w w, wimp_i i, int value, int decimal_places);