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

3 files changed, 10 insertions, 16 deletions

diff --git a/amiga/gui.c b/amiga/gui.c
index 76d912e73..c310cd04f 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2430,7 +2430,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 		if(option_use_pubscreen && (locked_screen == TRUE) &&
 			(strcmp(option_use_pubscreen,"Workbench") == 0))
 				iconifygadget = TRUE;
-		ami_create_menu(bw->browser_window_type, gwin->shared, dri);
+		ami_create_menu(gwin->shared);
 
 		NewList(&gwin->shared->tab_list);
 		gwin->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"),
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;
diff --git a/amiga/menu.h b/amiga/menu.h
index 39afb240c..306f5bb42 100755
--- a/amiga/menu.h
+++ b/amiga/menu.h
@@ -67,7 +67,7 @@ struct gui_window;
 struct gui_window_2;
 
 void ami_free_menulabs(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);
 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);