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

Patch level : 12.00 1322

Browse Source 
Files correlati     : 777.exe tp*.exe

Commento            :

Diano
CU
This commit is contained in:
Alessandro Bonazzi 2024-02-13 16:27:55 +01:00
parent 96adac3e57
commit a889d14508
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/include/alex.cpp
View File

@ -340,11 +340,27 @@ bool TAVM_monitor::on_field_event(TOperable_field& o, TField_event e, long jolly
{ {
switch (o.dlg()) switch (o.dlg())
{ {
case DLG_CANCEL: case DLG_CANCEL:
if (e == fe_button) if (e == fe_button)
set_ignore_mon(true); set_ignore_mon(true);
break; break;
default: break; case DLG_NEXTREC:
if (e == fe_button)
stop_run(K_F11);
break;
case DLG_LASTREC:
if (e == fe_button)
stop_run(K_F10);
break;
case DLG_ELABORA:
if (e == fe_button)
stop_run(K_F5);
break;
case DLG_QUIT:
if (e == fe_button)
stop_run(K_QUIT);
break;
default: break;
} }
return true; return true;
} }
@ -1143,7 +1159,7 @@ TAVM::~TAVM()
TAVM& TAlex_virtual_machine::avm() TAVM& TAlex_virtual_machine::avm()
{ {
if (_avm == NULL) if (_avm == nullptr)
_avm = new TAVM(this); _avm = new TAVM(this);
return *_avm; return *_avm;
} }

2
src/include/isam.cpp
View File

@ -2723,7 +2723,7 @@ int TSystemisamfile::overwrite(
// @comm Se <p extended> e' TRUE e trova alcune stringhe col formato %stringa% (es. %frm%) // @comm Se <p extended> e' TRUE e trova alcune stringhe col formato %stringa% (es. %frm%)
// ne sostituisce i valori (es. ditta corrente). // ne sostituisce i valori (es. ditta corrente).
// @xref <mf TSystemisamfile::dump> // @xref <mf TSystemisamfile::overwrite>
{ {
int err=NOERR; int err=NOERR;

1
src/include/report.h
View File

@ -703,6 +703,7 @@ public:
const TFilename& filename() const { return _path; } const TFilename& filename() const { return _path; }
bool save(const char* fname) const; bool save(const char* fname) const;
bool load(const char* fname); bool load(const char* fname);
void show_all_sections();
// Used by TReport_printer // Used by TReport_printer
void set_page(word r, word p) { _rep_page = r; _book_page = p; } void set_page(word r, word p) { _rep_page = r; _book_page = p; }

1
src/include/reprint.cpp
View File

@ -2798,6 +2798,7 @@ long TReport_book::print_section(TReport_section& rs)
if (rs.condition().full()) if (rs.condition().full())
{ {
TVariant var; TVariant var;
_report->evaluate(rs.condition(), var, _alfafld); _report->evaluate(rs.condition(), var, _alfafld);
if (!var.as_bool()) if (!var.as_bool())
return -2; return -2;