diff --git a/m770/774100.cpp b/m770/774100.cpp index e34912dca..c469e4775 100755 --- a/m770/774100.cpp +++ b/m770/774100.cpp @@ -476,7 +476,7 @@ bool TGenera_versamenti::menu(MENU_TAG m) int i = 0; TConfig cnf_user(CONFIG_USER); - if (m == BAR_ITEM(1)) + if (m == BAR_ITEM_ID(1)) { codditta_prec = get_firm_770(); while ((codditta = cnf_user.get_long(DITTE_SEL, _section, i++)) != 0L) @@ -506,7 +506,7 @@ bool TGenera_versamenti::create() _section = name(); _section.cut(2); - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } diff --git a/m770/774200.cpp b/m770/774200.cpp index 325bdeea9..0e55952c5 100755 --- a/m770/774200.cpp +++ b/m770/774200.cpp @@ -102,7 +102,7 @@ bool TRiporta_quadri::codditta_handler(TMask_field& f, KEY k) bool TRiporta_quadri::menu(MENU_TAG m) { - if (m == BAR_ITEM(1)) + if (m == BAR_ITEM_ID(1)) if (_liv == 'D') { TConfig conf(CONFIG_STUDIO); @@ -124,7 +124,7 @@ bool TRiporta_quadri::create() _riporta = new TRiporti; _msk = new TMask("774200a"); _msk->set_handler(F_CODDITTA, codditta_handler); - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } diff --git a/m770/775200.cpp b/m770/775200.cpp index 0f7c2c239..1950d10f5 100755 --- a/m770/775200.cpp +++ b/m770/775200.cpp @@ -86,7 +86,7 @@ bool TGenera_dett::set() bool TGenera_dett::menu(MENU_TAG m) { - if (m == BAR_ITEM(1)) + if (m == BAR_ITEM_ID(1)) return (set()); return FALSE; } @@ -116,7 +116,7 @@ bool TGenera_dett::create() _anno = 1994; _ente = "Aresi Alessandro"; */ - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } diff --git a/m770/776200.cpp b/m770/776200.cpp index f5ccbc36d..9874dff25 100755 --- a/m770/776200.cpp +++ b/m770/776200.cpp @@ -30,7 +30,7 @@ bool TImmissioneDichiarazione::create() _rel = new TRelation (LF_BASE); _rel->add(LF_BASEBIS, "CODDITTA=CODDITTA"); _msk = new TMask ("776200a"); - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } @@ -64,7 +64,7 @@ bool TImmissioneDichiarazione::do_it() bool TImmissioneDichiarazione::menu(MENU_TAG mt) { - if (mt == BAR_ITEM(1)) + if (mt == BAR_ITEM_ID(1)) return do_it(); return FALSE; } diff --git a/m770/776500.cpp b/m770/776500.cpp index 82e0d2fd8..b16acf9e4 100755 --- a/m770/776500.cpp +++ b/m770/776500.cpp @@ -134,7 +134,7 @@ bool TParametri_genera::create() _section.cut(2); _cnf = new TConfig(CONFIG_USER, _section); _rel = new TRelation (LF_BASE); - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } @@ -161,7 +161,7 @@ bool TParametri_genera::destroy() bool TParametri_genera::menu(MENU_TAG m) { - if (m == BAR_ITEM(1)) + if (m == BAR_ITEM_ID(1)) return main_loop(); return FALSE; } diff --git a/m770/776600.cpp b/m770/776600.cpp index 29c6e962c..4e63ac45c 100755 --- a/m770/776600.cpp +++ b/m770/776600.cpp @@ -77,7 +77,7 @@ bool TEstinti_app::create() _estint_sheet = new TCursor_sheet(_cur,"CODDITTA|9->RAGSOC", "Elenco estinti", "Codice|Ragione sociale@50", 0x18, 3); _msk->set_handler(F_ESTINTI, show_estinti); - dispatch_e_menu (BAR_ITEM(1)); + dispatch_e_menu (BAR_ITEM_ID(1)); return TRUE; } @@ -200,7 +200,7 @@ bool TEstinti_app::main_loop() bool TEstinti_app::menu(MENU_TAG m) { - if (m == BAR_ITEM(1)) + if (m == BAR_ITEM_ID(1)) return main_loop(); return FALSE; } diff --git a/m770/77stq.cpp b/m770/77stq.cpp index 3006429e7..dcd764989 100755 --- a/m770/77stq.cpp +++ b/m770/77stq.cpp @@ -918,7 +918,7 @@ bool TStampaQuadro::create() user_create(); - dispatch_e_menu(BAR_ITEM(1)); + dispatch_e_menu(BAR_ITEM_ID(1)); return TRUE; } diff --git a/m770/generic.cpp b/m770/generic.cpp index a77ec65ab..580eca2dd 100755 --- a/m770/generic.cpp +++ b/m770/generic.cpp @@ -713,7 +713,7 @@ class TGeneric_application : public TApplication TFilename _maskname; protected: - bool create() { dispatch_e_menu(BAR_ITEM(1)); return TRUE; } + bool create() { dispatch_e_menu(BAR_ITEM_ID(1)); return TRUE; } bool destroy() { return TRUE; } bool menu(MENU_TAG);