root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :10.0 250

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretta chiamata dei MENU_ITEM con MENU_ITEM_ID


git-svn-id: svn://10.65.10.50/trunk@18329 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-02-23 14:48:30 +00:00
parent 63c37f1b29
commit 7407e5c676
3 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ba/ba2600.cpp
View File

@ -2856,19 +2856,19 @@ void TEditMask_window::add_control(MENU_TAG m)
switch(m) switch(m)
{ {
case MENU_ITEM(31): w->addbutton(); break; case MENU_ITEM_ID(31): w->addbutton(); break;
case MENU_ITEM(32): w->addboolean(); break; case MENU_ITEM_ID(32): w->addboolean(); break;
case MENU_ITEM(33): w->addcurrency(); break; case MENU_ITEM_ID(33): w->addcurrency(); break;
case MENU_ITEM(34): w->adddate(); break; case MENU_ITEM_ID(34): w->adddate(); break;
case MENU_ITEM(35): w->addgroup(); break; case MENU_ITEM_ID(35): w->addgroup(); break;
case MENU_ITEM(36): w->addlist(); break; case MENU_ITEM_ID(36): w->addlist(); break;
case MENU_ITEM(37): w->addmemo(); break; case MENU_ITEM_ID(37): w->addmemo(); break;
case MENU_ITEM(38): w->addnumber(); break; case MENU_ITEM_ID(38): w->addnumber(); break;
case MENU_ITEM(39): w->addradio(); break; case MENU_ITEM_ID(39): w->addradio(); break;
case MENU_ITEM(311): w->addstring(); break; case MENU_ITEM_ID(311): w->addstring(); break;
case MENU_ITEM(312): w->addtext(); break; case MENU_ITEM_ID(312): w->addtext(); break;
case MENU_ITEM(313): w->addzoom(); break; case MENU_ITEM_ID(313): w->addzoom(); break;
case MENU_ITEM(310): case MENU_ITEM_ID(310):
if (!is_sheet) { if (!is_sheet) {
ctl = w->addsheet(); ctl = w->addsheet();
_nsheet++; _nsheet++;
@ -3219,7 +3219,7 @@ KEY TEditMask_window::main_loop()
//Richiama <TApplication::create> //Richiama <TApplication::create>
bool TMaskEditor_application::create() bool TMaskEditor_application::create()
{ {
dispatch_e_menu(MENU_ITEM(11)); dispatch_e_menu(MENU_ITEM_ID(11));
return true; return true;
} }
@ -3385,16 +3385,16 @@ bool TMaskEditor_application::menu(MENU_TAG m)
{ {
switch (m) switch (m)
{ {
case MENU_ITEM(11): // Nuovo... case MENU_ITEM_ID(11): // Nuovo...
{ {
_save=FALSE; _save=FALSE;
new_mask(); new_mask();
} }
break; break;
case MENU_ITEM(12): // Apri... case MENU_ITEM_ID(12): // Apri...
open_mask(); open_mask();
break; break;
case MENU_ITEM(13): // Salva... case MENU_ITEM_ID(13): // Salva...
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3404,7 +3404,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
else save_as_mask(); else save_as_mask();
} }
break; break;
case MENU_ITEM(14): // Salva con nome case MENU_ITEM_ID(14): // Salva con nome
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3412,32 +3412,32 @@ bool TMaskEditor_application::menu(MENU_TAG m)
save_as_mask(); save_as_mask();
} }
break; break;
case MENU_ITEM(21): // Copia i controlli selezionati case MENU_ITEM_ID(21): // Copia i controlli selezionati
if(_window) if(_window)
copy_crt_sel(); copy_crt_sel();
break; break;
case MENU_ITEM(22): // Elimina i controlli selezionati case MENU_ITEM_ID(22): // Elimina i controlli selezionati
if(_window) if(_window)
erase_crt_sel(); erase_crt_sel();
break; break;
case MENU_ITEM(23): // Sposta i controlli selezionati in un'altra pagina case MENU_ITEM_ID(23): // Sposta i controlli selezionati in un'altra pagina
if(_window) if(_window)
move_crt_sel(); move_crt_sel();
break; break;
//Aggiunge controlli alla maschera //Aggiunge controlli alla maschera
case MENU_ITEM(31): //bottone case MENU_ITEM_ID(31): //bottone
case MENU_ITEM(32): //checkbox case MENU_ITEM_ID(32): //checkbox
case MENU_ITEM(33): //currency case MENU_ITEM_ID(33): //currency
case MENU_ITEM(34): //data case MENU_ITEM_ID(34): //data
case MENU_ITEM(35): //group case MENU_ITEM_ID(35): //group
case MENU_ITEM(36): //lista case MENU_ITEM_ID(36): //lista
case MENU_ITEM(37): //memo case MENU_ITEM_ID(37): //memo
case MENU_ITEM(38): //radio_bottoni case MENU_ITEM_ID(38): //radio_bottoni
case MENU_ITEM(39): //number case MENU_ITEM_ID(39): //number
case MENU_ITEM(310): //spreadsheet case MENU_ITEM_ID(310): //spreadsheet
case MENU_ITEM(311): //stringa case MENU_ITEM_ID(311): //stringa
case MENU_ITEM(312): //text case MENU_ITEM_ID(312): //text
case MENU_ITEM(313): //zoom case MENU_ITEM_ID(313): //zoom
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3445,7 +3445,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
add_control(m); add_control(m);
} }
break; break;
case MENU_ITEM(41): // Visualizza controlli di pag. case MENU_ITEM_ID(41): // Visualizza controlli di pag.
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3453,7 +3453,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
vision_ctrl(); vision_ctrl();
} }
break; break;
case MENU_ITEM(42): // Visualizza mask di spread case MENU_ITEM_ID(42): // Visualizza mask di spread
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3461,7 +3461,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
vision_spread(); vision_spread();
} }
break; break;
case MENU_ITEM(43): // Visualizza controlli di mask di spread case MENU_ITEM_ID(43): // Visualizza controlli di mask di spread
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3469,7 +3469,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
vision_sp_ctl(); vision_sp_ctl();
} }
break; break;
case MENU_ITEM(51): // Fa la compilazione della maschera case MENU_ITEM_ID(51): // Fa la compilazione della maschera
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();
@ -3477,7 +3477,7 @@ bool TMaskEditor_application::menu(MENU_TAG m)
build(); build();
} }
break; break;
case MENU_ITEM(52): // Fa l'esecuzione della maschera case MENU_ITEM_ID(52): // Fa l'esecuzione della maschera
if(_window) if(_window)
{ {
_window->deselection(); _window->deselection();

2
ba/bacnv.cpp
View File

@ -219,7 +219,7 @@ bool TConversione_archivi::create()
else set_firm(_codditta); else set_firm(_codditta);
} }
} }
dispatch_e_menu(MENU_ITEM(1)); dispatch_e_menu(MENU_ITEM_ID(1));
return TRUE; return TRUE;
} }

60
ba/baformed.cpp
View File

@ -179,11 +179,11 @@ bool TForm_editor::create()
} }
if (!_extra) if (!_extra)
{ {
remove_menu(BAR_ITEM(1)); remove_menu(BAR_ITEM_ID(1));
remove_menu(BAR_ITEM(2)); remove_menu(BAR_ITEM_ID(2));
remove_menu(BAR_ITEM(3)); remove_menu(BAR_ITEM_ID(3));
remove_menu(BAR_ITEM(4)); remove_menu(BAR_ITEM_ID(4));
remove_menu(BAR_ITEM(5)); remove_menu(BAR_ITEM_ID(5));
} }
enable_menu_item(M_FILE_PRINT); enable_menu_item(M_FILE_PRINT);
@ -191,10 +191,10 @@ bool TForm_editor::create()
if ((form && code) || (form && code == 0 && _extra)) if ((form && code) || (form && code == 0 && _extra))
{ {
_form = new TForm(form, (code!=0) ? format("%05ld",code) : "", _extra ? 2 : 1); _form = new TForm(form, (code!=0) ? format("%05ld",code) : "", _extra ? 2 : 1);
if (!_extra) dispatch_e_menu(MENU_ITEM(14)); if (!_extra) dispatch_e_menu(MENU_ITEM_ID(14));
} }
else else
dispatch_e_menu(MENU_ITEM(14)); dispatch_e_menu(MENU_ITEM_ID(14));
if (form) if (form)
{ {
@ -223,50 +223,50 @@ bool TForm_editor::menu(MENU_TAG tag)
switch(tag) switch(tag)
{ {
case MENU_ITEM(11): case MENU_ITEM_ID(11):
sec = 'R'; pt = odd_page; break; sec = 'R'; pt = odd_page; break;
case MENU_ITEM(12): case MENU_ITEM_ID(12):
sec = 'D'; pt = odd_page; break; sec = 'D'; pt = odd_page; break;
case MENU_ITEM(13): case MENU_ITEM_ID(13):
sec = 'K'; break; sec = 'K'; break;
case MENU_ITEM(14): case MENU_ITEM_ID(14):
quit = ask_profile(); quit = ask_profile();
sec = 'B'; pt = odd_page; break; sec = 'B'; pt = odd_page; break;
case MENU_ITEM(15): // formato numeri case MENU_ITEM_ID(15): // formato numeri
sec = 'J'; break; sec = 'J'; break;
case MENU_ITEM(16): // formato date case MENU_ITEM_ID(16): // formato date
sec = 'Y'; break; sec = 'Y'; break;
case MENU_ITEM(21): case MENU_ITEM_ID(21):
sec = 'H'; pt = odd_page; break; sec = 'H'; pt = odd_page; break;
case MENU_ITEM(22): case MENU_ITEM_ID(22):
sec = 'H'; pt = even_page; break; sec = 'H'; pt = even_page; break;
case MENU_ITEM(23): case MENU_ITEM_ID(23):
sec = 'H'; pt = first_page; break; sec = 'H'; pt = first_page; break;
case MENU_ITEM(24): case MENU_ITEM_ID(24):
sec = 'H'; pt = last_page; break; sec = 'H'; pt = last_page; break;
case MENU_ITEM(31): case MENU_ITEM_ID(31):
sec = 'B'; pt = odd_page; break; sec = 'B'; pt = odd_page; break;
case MENU_ITEM(32): case MENU_ITEM_ID(32):
sec = 'B'; pt = even_page; break; sec = 'B'; pt = even_page; break;
case MENU_ITEM(33): case MENU_ITEM_ID(33):
sec = 'B'; pt = first_page; break; sec = 'B'; pt = first_page; break;
case MENU_ITEM(34): case MENU_ITEM_ID(34):
sec = 'B'; pt = last_page; break; sec = 'B'; pt = last_page; break;
case MENU_ITEM(41): case MENU_ITEM_ID(41):
sec = 'F'; pt = odd_page; break; sec = 'F'; pt = odd_page; break;
case MENU_ITEM(42): case MENU_ITEM_ID(42):
sec = 'F'; pt = even_page; break; sec = 'F'; pt = even_page; break;
case MENU_ITEM(43): case MENU_ITEM_ID(43):
sec = 'F'; pt = first_page; break; sec = 'F'; pt = first_page; break;
case MENU_ITEM(44): case MENU_ITEM_ID(44):
sec = 'F'; pt = last_page; break; sec = 'F'; pt = last_page; break;
case MENU_ITEM(51): case MENU_ITEM_ID(51):
sec = 'G'; pt = odd_page; break; sec = 'G'; pt = odd_page; break;
case MENU_ITEM(52): case MENU_ITEM_ID(52):
sec = 'G'; pt = even_page; break; sec = 'G'; pt = even_page; break;
case MENU_ITEM(53): case MENU_ITEM_ID(53):
sec = 'G'; pt = first_page; break; sec = 'G'; pt = first_page; break;
case MENU_ITEM(54): case MENU_ITEM_ID(54):
sec = 'G'; pt = last_page; break; sec = 'G'; pt = last_page; break;
default: default:
break; break;
@ -593,7 +593,7 @@ bool TForm_editor::edit(char s, pagetype t)
_form->write_profile(); _form->write_profile();
} }
if (!_extra) dispatch_e_menu(MENU_ITEM(14)); if (!_extra) dispatch_e_menu(MENU_ITEM_ID(14));
return dirty; return dirty;
} }