diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-03 19:27:40 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-03 19:27:40 +0000 |
| commit | 695783e33b9c100b1ce28ef71a59a00f52cc374f (patch) | |
| tree | 3ef0700f8d45ad7f68a921d9a90094c5e4e66c1d /frontends/amiga/gui.h | |
| parent | 3b1ef784fd53095213fa8b89806982567359dca4 (diff) | |
| download | netsurf-695783e33b9c100b1ce28ef71a59a00f52cc374f.tar.gz netsurf-695783e33b9c100b1ce28ef71a59a00f52cc374f.tar.bz2 | |
re-structure menu code to make it useable elsewhere in the frontend
Diffstat (limited to 'frontends/amiga/gui.h')
| -rw-r--r-- | frontends/amiga/gui.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 4c3e586d7..a176df100 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -110,6 +110,8 @@ struct ami_generic_window { const struct ami_win_event_table *tbl; }; +struct ami_menu_data; + struct gui_window_2 { struct ami_generic_window w; struct Window *win; @@ -132,13 +134,7 @@ struct gui_window_2 { int temp; bool redraw_scroll; bool new_content; - char *restrict menulab[AMI_MENU_AREXX_MAX + 1]; - Object *restrict menuobj[AMI_MENU_AREXX_MAX + 1]; - char menukey[AMI_MENU_AREXX_MAX + 1]; - char *restrict menuicon[AMI_MENU_AREXX_MAX + 1]; - struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1]; - UBYTE *menutype; - struct NewMenu *menu; + struct ami_menu_data *menu_data[AMI_MENU_AREXX_MAX + 1]; ULONG hotlist_items; Object *restrict hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX]; struct List hotlist_toolbar_list; @@ -163,7 +159,6 @@ struct gui_window_2 { struct MinList *shared_pens; gui_pointer_shape mouse_pointer; struct Menu *imenu; /* Intuition menu */ - struct VisualInfo *vi; /* For GadTools menu */ bool closed; /* Window has been closed (via menu) */ }; |