diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-04 22:26:24 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-04 22:26:24 +0000 |
commit | 985bf9e1917e7da57ab72f12357ab31cd4a26ca8 (patch) | |
tree | 9341e2341d39f5c5cc62dba0ba11294186452748 /amiga/menu.c | |
parent | 0cc93c221bb71e38fa29aa2895599bf86ecb6599 (diff) | |
download | netsurf-985bf9e1917e7da57ab72f12357ab31cd4a26ca8.tar.gz netsurf-985bf9e1917e7da57ab72f12357ab31cd4a26ca8.tar.bz2 |
Remove browser_window type from ami_create_menu()
Remove DrawInfo too, as only there for image menus which never worked.
svn path=/trunk/netsurf/; revision=12718
Diffstat (limited to 'amiga/menu.c')
-rwxr-xr-x | amiga/menu.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index c1546630d..8eb78ec98 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -124,7 +124,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin) gwin->menu = NULL; } -void ami_init_menulabs(struct gui_window_2 *gwin, struct DrawInfo *dri) +void ami_init_menulabs(struct gui_window_2 *gwin) { int i; @@ -272,7 +272,7 @@ void ami_menu_refresh(struct gui_window_2 *gwin) TAG_DONE); ami_free_menulabs(gwin); - ami_create_menu(BROWSER_WINDOW_NORMAL, gwin); + ami_create_menu(gwin); SetAttrs(gwin->objects[OID_MAIN], WINDOW_NewMenu, gwin->menu, @@ -282,19 +282,13 @@ void ami_menu_refresh(struct gui_window_2 *gwin) } */ -struct NewMenu *ami_create_menu(ULONG type, struct gui_window_2 *gwin, struct DrawInfo *dri) +struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) { int i; - ULONG menuflags = 0; - ami_init_menulabs(gwin, dri); + ami_init_menulabs(gwin); gwin->menu = AllocVec(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), MEMF_CLEAR); - if(type != BROWSER_WINDOW_NORMAL) - { - menuflags = NM_ITEMDISABLED; - } - for(i=0;i<=AMI_MENU_AREXX_MAX;i++) { gwin->menu[i].nm_Type = gwin->menutype[i]; @@ -303,10 +297,10 @@ struct NewMenu *ami_create_menu(ULONG type, struct gui_window_2 *gwin, struct Dr gwin->menu[i].nm_Flags = 0; } - gwin->menu[1].nm_Flags = menuflags; - gwin->menu[2].nm_Flags = menuflags; - gwin->menu[12].nm_Flags = menuflags; - gwin->menu[13].nm_Flags = menuflags; + gwin->menu[1].nm_Flags = 0; + gwin->menu[2].nm_Flags = 0; + gwin->menu[12].nm_Flags = 0; + gwin->menu[13].nm_Flags = 0; #ifndef WITH_PDF_EXPORT gwin->menu[9].nm_Flags = NM_ITEMDISABLED; |