From 6173bb0e6c3bf51cd463f7bc4f725429d9087b2b Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 5 Oct 2010 19:14:46 +0000 Subject: Merge treeview-redux to trunk svn path=/trunk/netsurf/; revision=10865 --- amiga/menu.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'amiga/menu.h') diff --git a/amiga/menu.h b/amiga/menu.h index 8f925411a..5a739d616 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -19,12 +19,14 @@ #ifndef AMIGA_MENU_H #define AMIGA_MENU_H #include -#include "amiga/gui.h" #include +#include +#include "content/hlcache.h" /* Number of hotlist items, menu structure needs to be changed in ami_create_menu() * if this value is changed. */ -#define AMI_HOTLIST_ITEMS 40 +#define AMI_HOTLIST_ITEMS 60 +//gwin->hotlist_items /* Maximum number of menu items - first value is number of static items * (ie. everything not intially defined as NM_IGNORE) */ @@ -61,11 +63,12 @@ #define AMI_MENU_CLEAR FULLMENUNUM(1,5,0) #define AMI_MENU_FIND FULLMENUNUM(2,0,0) -char *menulab[AMI_MENU_AREXX_MAX+1]; +struct gui_window; +struct gui_window_2; -struct NewMenu *ami_create_menu(ULONG type); -void ami_init_menulabs(void); -void ami_free_menulabs(void); +void ami_free_menulabs(struct gui_window_2 *gwin); +struct NewMenu *ami_create_menu(ULONG type, struct gui_window_2 *gwin); +void ami_menu_refresh(struct gui_window_2 *gwin); void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item); void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c); #endif -- cgit v1.2.3