summaryrefslogtreecommitdiff
path: root/riscos/gui.h
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2004-10-04 23:54:42 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2004-10-04 23:54:42 +0000
commit403f12872d55a71b04287ed828be0c63be19e856 (patch)
tree190dbf327b98bb49831dc609f6c13bd828ded377 /riscos/gui.h
parent7144ce65ebbc7b1cb77d1f6b678a6d2b3c6547d1 (diff)
downloadnetsurf-403f12872d55a71b04287ed828be0c63be19e856.tar.gz
netsurf-403f12872d55a71b04287ed828be0c63be19e856.tar.bz2
[project @ 2004-10-04 23:54:42 by rjw]
Moved GIF file reading to image/, optimisation of plotting for GIFs, JNGs, PNGs and JPEGs, initial work for toolbar customisation. Possibly some other things too. svn path=/import/netsurf/; revision=1301
Diffstat (limited to 'riscos/gui.h')
-rw-r--r--riscos/gui.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/riscos/gui.h b/riscos/gui.h
index b6c68e07d..f2394e641 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -32,7 +32,7 @@ extern wimp_w dialog_info, dialog_saveas, dialog_config, dialog_config_br,
extern wimp_w history_window;
extern wimp_w hotlist_window;
extern wimp_menu *iconbar_menu, *browser_menu, *combo_menu, *hotlist_menu,
- *proxyauth_menu, *languages_menu;
+ *proxyauth_menu, *languages_menu, *toolbar_menu;
extern int iconbar_menu_height;
extern struct form_control *current_gadget;
extern bool gui_reformat_pending;
@@ -98,6 +98,7 @@ struct gui_window {
};
+extern struct toolbar *current_toolbar;
extern struct gui_window *current_gui;
extern struct gui_window *ro_gui_current_redraw_gui;
extern struct gui_window *ro_gui_current_zoom_gui;
@@ -265,9 +266,8 @@ bool ro_gui_print_keypress(wimp_key *key);
#define ICON_TOOLBAR_BOOKMARK 8
#define ICON_TOOLBAR_SCALE 9
#define ICON_TOOLBAR_SEARCH 10
-#define ICON_TOOLBAR_UP 11
-#define ICON_TOOLBAR_URL 12 // Must be after highest toolbar icon
-#define ICON_TOOLBAR_THROBBER 13
+#define ICON_TOOLBAR_URL 11 // Must be after highest toolbar icon
+#define ICON_TOOLBAR_THROBBER 12
/* icon numbers for hotlist toolbars */
#define ICON_TOOLBAR_CREATE 0
@@ -275,8 +275,7 @@ bool ro_gui_print_keypress(wimp_key *key);
#define ICON_TOOLBAR_EXPAND 2
#define ICON_TOOLBAR_OPEN 3
#define ICON_TOOLBAR_LAUNCH 4
-#define ICON_TOOLBAR_SORT 5
-#define ICON_TOOLBAR_HOTLIST_LAST 6
+#define ICON_TOOLBAR_HOTLIST_LAST 5
/* icon numbers for toolbar status window */
#define ICON_STATUS_RESIZE 0