diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-06-08 17:10:30 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-06-08 17:10:30 +0100 |
| commit | 9b54d6bb9c49fa4127ec6b62f21a44c20ca912aa (patch) | |
| tree | c29ef8fdbebb7758f8edf25a42117d87db97c3d7 | |
| parent | 431f9fde5f009f70b9519bbbfb6113f8461a2b9b (diff) | |
| download | netsurf-9b54d6bb9c49fa4127ec6b62f21a44c20ca912aa.tar.gz netsurf-9b54d6bb9c49fa4127ec6b62f21a44c20ca912aa.tar.bz2 | |
Remove PDF menu item if built without PDF export
| -rw-r--r-- | amiga/menu.c | 9 | ||||
| -rwxr-xr-x | amiga/menu.h | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index bcf42af5d..3e9ac9708 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -192,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); @@ -317,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) @@ -466,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; @@ -474,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; diff --git a/amiga/menu.h b/amiga/menu.h index 53c2db5f3..e96fcf0ee 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -41,8 +41,10 @@ enum { M_SAVESRC, M_SAVETXT, M_SAVECOMP, - M_SAVEPDF, M_SAVEIFF, +#ifdef WITH_PDF_EXPORT + M_SAVEPDF, +#endif M_BAR_P2, M_CLOSETAB, M_CLOSEWIN, @@ -108,8 +110,8 @@ enum { /* The Intuition menu numbers of some menus we might need to modify */ #define AMI_MENU_SAVEAS_TEXT FULLMENUNUM(0,4,1) #define AMI_MENU_SAVEAS_COMPLETE FULLMENUNUM(0,4,2) -#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,3) -#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,4) +#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,3) +#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,4) #define AMI_MENU_CLOSETAB FULLMENUNUM(0,6,0) #define AMI_MENU_CUT FULLMENUNUM(1,0,0) #define AMI_MENU_COPY FULLMENUNUM(1,1,0) |