diff --git a/ba/ba2.url b/ba/ba2.url index da53967ca..d5d571522 100755 --- a/ba/ba2.url +++ b/ba/ba2.url @@ -1,5 +1,6 @@ #include +/* #define MENU_FILE_ALT TASK_MENUBAR+4000 #define M_FIL1_NEW MENU_FILE_ALT+101 @@ -13,19 +14,22 @@ ITEM M_FIL1_NEW "~Nuovo" ITEM M_FIL1_OPEN "~Apri" ITEM M_FIL1_SAVE "~Salva" ITEM M_FIL1_SAVEAS "Salva ~con Nome" -ITEM M_FIL1_QUIT "~Fine" SEPARATOR -ITEM M_FILE_ABOUT "~Informazioni" +ITEM M_FIL1_QUIT "~Fine" +*/ + MENUBAR MENU_BAR(0) MENU MENU_BAR(0) SUBMENU MENU_FILE "~File" +SUBMENU M_EDIT "~Modifica" SUBMENU BAR_ITEM(1) "~Dati" SUBMENU BAR_ITEM(2) "~Testa" SUBMENU BAR_ITEM(3) "~Corpo" SUBMENU BAR_ITEM(4) "~Piede" SUBMENU BAR_ITEM(5) "~Sfondo" +SUBMENU M_HELP "~Help" MENU BAR_ITEM(1) ITEM MENU_ITEM(11) "~Relazione" diff --git a/ba/ba2200.cpp b/ba/ba2200.cpp index 1520b2470..738acd326 100755 --- a/ba/ba2200.cpp +++ b/ba/ba2200.cpp @@ -31,7 +31,7 @@ bool TArchive_app::create() { bool ok = TRUE; - TIsamfile utenti(LF_USER, FALSE); + TIsamfile utenti(LF_USER); utenti.open(_excllock); for (int err = utenti.first(); err == NOERR; err = utenti.next()) { diff --git a/ba/ba3.cpp b/ba/ba3.cpp index 2a96d68fb..3396acd4c 100755 --- a/ba/ba3.cpp +++ b/ba/ba3.cpp @@ -1,40 +1,31 @@ #include -#include - #include "ba3.h" -#define usage "Error - usage : %s -{0|1|2|3|4|5|6|7|8|9}" - int main(int argc, char** argv) { - int rt = -1; - const int r = (argc > 1) ? atoi(&argv[1][1]) : -1; - + const int r = (argc > 1) ? argv[1][1] - '0' : 0; switch (r) { - case 0: - rt = ba3100(argc,argv) ; break; case 1: - rt = ba3200(argc,argv) ; break; + ba3200(argc,argv); break; case 2: - rt = ba3300(argc,argv) ; break; + ba3300(argc,argv); break; case 3: - rt = ba3400(argc,argv) ; break; + ba3400(argc,argv); break; case 4: - rt = ba3500(argc,argv) ; break; + ba3500(argc,argv); break; case 5: - rt = ba3600(argc,argv) ; break; + ba3600(argc,argv); break; case 6: - rt = ba3700(argc,argv) ; break; + ba3700(argc,argv); break; case 7: - rt = ba3800(argc,argv) ; break; + ba3800(argc,argv); break; case 8: - rt = ba3900(argc,argv) ; break; + ba3900(argc,argv); break; case 9: - rt = ba3a00(argc,argv) ; break; + ba3a00(argc,argv); break; default: - error_box(usage, argv[0]) ; break; + ba3100(argc,argv); break; } - exit(0); - return rt ; + return 0; }