From 7cb9b4d79b078040967e5326615779d7c073b23d Mon Sep 17 00:00:00 2001 From: James Bursa Date: Thu, 6 May 2004 20:37:48 +0000 Subject: [project @ 2004-05-06 20:37:48 by bursa] Remove obsolete theme files. Hide some unimplemented toolbar icons. F2 moves caret to URL bar and clears it to "www.". Simplify some of the toolbar code. Fix menu-related crash (reported by Jerome Mathevet). svn path=/import/netsurf/; revision=836 --- riscos/toolbar.h | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'riscos/toolbar.h') diff --git a/riscos/toolbar.h b/riscos/toolbar.h index f54bde320..c7c94cf94 100644 --- a/riscos/toolbar.h +++ b/riscos/toolbar.h @@ -15,29 +15,7 @@ #include "oslib/wimp.h" -struct toolbar_icon { - /* The desired WIMP icon number (-1 for separator) - */ - int icon_number; - - /* Set to non-zero to display the icon - */ - unsigned int available; - - /* Icon dimensions (OS units) - */ - unsigned int width; - unsigned int height; - - /* Icon validation, or NULL if this icon is unavailable - */ - unsigned char* validation; - - /* The next icon (linked list) - */ - struct toolbar_icon *next_icon; // Next toolbar icon -}; - +struct toolbar_icon; struct toolbar { @@ -51,7 +29,7 @@ struct toolbar { int status_old_width; // Old status width int width; // Toolbar width on last reformat unsigned int height; // Toolbar height on last reformat - + /* General options */ unsigned int throbber_width; // Throbber width (0 = unavaiable) @@ -61,11 +39,11 @@ struct toolbar { unsigned int url_bar; // Show URL bar? unsigned int throbber; // Show Throbber? unsigned int status_width; // Width of status window - + /* The first toolbar icon */ struct toolbar_icon *icon; - + /* Window handles */ wimp_w toolbar_handle; -- cgit v1.2.3