diff options
Diffstat (limited to 'amiga/menu.c')
| -rw-r--r-- | amiga/menu.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index d5e67b9f1..3e9ac9708 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -159,32 +159,6 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type, } } - if((GadToolsBase->lib_Version > 53) || - ((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 5))) { - /* GadTools 53.5+ only. For now we will only create the menu - using label.image if there's a bitmap associated with the item. */ - if(bm != NULL) { - struct DrawInfo *dri = GetScreenDrawInfo(scrn); - struct BitMap *menu_icon = ami_bitmap_get_native(bm, 16, 16, NULL); - - gwin->menuobj[num] = LabelObject, - LABEL_DrawInfo, dri, - LABEL_DisposeImage, TRUE, - LABEL_Image, BitMapObject, - BITMAP_Screen, scrn, - BITMAP_BitMap, menu_icon, - BITMAP_Width, 16, - BITMAP_Height, 16, - BitMapEnd, - LABEL_Text, gwin->menulab[num], - LabelEnd; - - gwin->menutype[num] |= MENU_IMAGE; - - FreeScreenDrawInfo(scrn, dri); - } - } - if(key) gwin->menukey[num] = key; if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func; if(hookdata) gwin->menu_hook[num].h_Data = hookdata; @@ -218,8 +192,10 @@ void ami_init_menulabs(struct gui_window_2 *gwin) ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT); ami_menu_alloc_item(gwin, M_SAVECOMP, NM_SUB, "SaveCompNS", 0, NULL, ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE); +#ifdef WITH_PDF_EXPORT ami_menu_alloc_item(gwin, M_SAVEPDF, NM_SUB, "PDFNS", 0, NULL, ami_menu_item_project_save, (void *)AMINS_SAVE_PDF); +#endif ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL, ami_menu_item_project_save, (void *)AMINS_SAVE_IFF); ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); @@ -343,9 +319,6 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) if(gwin->menu_hook[i].h_Entry) gwin->menu[i].nm_UserData = &gwin->menu_hook[i]; } -#ifndef WITH_PDF_EXPORT - gwin->menu[M_SAVEPDF].nm_Flags = NM_ITEMDISABLED; -#endif #if defined(WITH_JS) || defined(WITH_MOZJS) gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE; if(nsoption_bool(enable_javascript) == true) @@ -492,7 +465,7 @@ void ami_menu_update_checked(struct gui_window_2 *gwin) GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip); if(!menustrip) return; - +#if defined(WITH_JS) || defined(WITH_MOZJS) if(nsoption_bool(enable_javascript) == true) { if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0) ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; @@ -500,7 +473,7 @@ void ami_menu_update_checked(struct gui_window_2 *gwin) if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; } - +#endif if(nsoption_bool(foreground_images) == true) { if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0) ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; |