1 files changed, 17 insertions, 72 deletions
diff --git a/riscos/theme.h b/riscos/theme.h
index 5372e3ea1..249328674 100644
--- a/riscos/theme.h
+++ b/riscos/theme.h
@@ -3,83 +3,28 @@
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
  */
 
-#ifndef _MIGRATE_RISCOS_THEME_H_
-#define _MIGRATE_RISCOS_THEME_H_
-
-#include "oslib/wimp.h"
-#include "oslib/messagetrans.h"
-
-typedef enum {THEME_THEMEINFO, THEME_TOOLBAR} theme_window_type;
-
-struct ro_theme
-{
-  wimp_window* theme_info;
-  wimp_window* toolbar;
-
-  char* filename;
-
-  char* indirected_data;
-  char* window_and_icon_data;
-
-  osspriteop_area* sprites;
-  int throbs;
-
-  struct
-  {
-    messagetrans_control_block cb;
-    char* data;
-    char* filename;
-  } iconNames;
-
-  struct
-  {
-    messagetrans_control_block cb;
-    char* data;
-    char* filename;
-  } iconSizes;
-
-};
-
-struct ro_theme_window
-{
-  theme_window_type type;
-
-  union {
-    struct {
-      char* indirected_url;
-      char* indirected_status;
-    } toolbar;
-    struct {
-      char* indirected_url;
-      char* indirected_title;
-      char* indirected_size;
-      char* indirected_process;
-    } about;
-  } data;
-};
-
-typedef struct ro_theme_window ro_theme_window;
-typedef struct ro_theme ro_theme;
-
-extern ro_theme *current_theme;
-
-typedef enum {theme_TOOLBAR_UNKNOWN,
-              theme_TOOLBAR_BACK, theme_TOOLBAR_FORWARD, theme_TOOLBAR_RELOAD,
-              theme_TOOLBAR_URL, theme_TOOLBAR_STATUS} theme_gadget;
-
-/* install a new theme */
-ro_theme* ro_theme_create(char* pathname);
+/** \file
+ * Toolbar themes (interface).
+ *
+ * A theme consists of a template for the toolbar and icons. There is one
+ * current theme, which is changed by ro_theme_load(). A toolbar can then be
+ * created and manipulated.
+ */
 
-/* return icon number */
-wimp_i ro_theme_icon(ro_theme* theme, theme_window_type type, const char* token);
+#ifndef _NETSURF_RISCOS_THEME_H_
+#define _NETSURF_RISCOS_THEME_H_
 
-/* create a window */
-wimp_w ro_theme_create_window(ro_theme* theme, ro_theme_window* create);
+#include "oslib/wimp.h"
 
-int ro_theme_toolbar_height(ro_theme* theme);
+extern unsigned int theme_throbs;
 
-void ro_theme_resize(ro_theme* theme, theme_window_type wintype, wimp_w w, int width, int height);
+void ro_theme_load(char *pathname);
+wimp_w ro_theme_create_toolbar(char *url_buffer, char *status_buffer,
+		char *throbber_buffer);
+int ro_theme_toolbar_height(void);
+void ro_theme_resize_toolbar(wimp_w w, int width, int height);
 
 #endif