From 7b262723470a6ea02dcb6dcd6d63eda0987e2dea Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 27 Mar 1995 14:36:11 +0000 Subject: [PATCH] Corretto errore fatale in uscita dalle applicazioni con scelte multiple sulla barra menu git-svn-id: svn://10.65.10.50/trunk@1175 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/applicat.cpp | 4 +-- include/clifo.h | 2 +- include/controls.cpp | 4 ++- include/execp.cpp | 6 +++- include/msksheet.cpp | 2 +- include/partite.h | 76 +++++++++++++++++++++++--------------------- 6 files changed, 51 insertions(+), 43 deletions(-) diff --git a/include/applicat.cpp b/include/applicat.cpp index 7a881ba36..76e17f8e1 100755 --- a/include/applicat.cpp +++ b/include/applicat.cpp @@ -298,7 +298,6 @@ void TApplication::terminate() WinHelp(hwnd, "prassi.hlp", HELP_QUIT, 0L); } #endif - do_events(); if (_printer != NULL) // Distruzione dell'eventuale stampante { @@ -308,6 +307,7 @@ void TApplication::terminate() _printer = NULL; } } + do_events(); if (use_files()) free_global_vars(); // Distruzione variabili globali @@ -378,7 +378,7 @@ void TApplication::set_perms() void TApplication::check_parameters(int & argc, char* argv[]) { - if (strncmp(argv[argc-1], "-u", 2) == 0) + if (strncmp(argv[argc-1], "-u", 2) == 0 || strncmp(argv[argc-1], "/u", 2) == 0) user() = &argv[--argc][2]; #ifdef DBG else user() = "PRASSI"; diff --git a/include/clifo.h b/include/clifo.h index 2bda51f1f..6248b4ec2 100755 --- a/include/clifo.h +++ b/include/clifo.h @@ -39,7 +39,7 @@ #define CLI_COMNASC "COMNASC" #define CLI_CODSTAT "CODSTAT" #define CLI_CODABI "CODABI" -#define CLI_CODBAN "CODBAN" +#define CLI_CODCAB "CODCAB" #define CLI_CODAGE "CODAGE" #define CLI_SCONTO "SCONTO" #define CLI_CODVAL "CODVAL" diff --git a/include/controls.cpp b/include/controls.cpp index 10f89fbf3..7be7c44f5 100755 --- a/include/controls.cpp +++ b/include/controls.cpp @@ -917,7 +917,9 @@ void TCheckbox::draw_pressed(bool pressed) const pic = pressed ? BMP_RADIO_ON : BMP_RADIO_OFF; else pic = pressed ? BMP_CHECK_ON : BMP_CHECK_OFF; - cpb.image(pic).draw(_hdc); + + if (cpb.exist(pic)) + cpb.image(pic).draw(_hdc); } diff --git a/include/execp.cpp b/include/execp.cpp index 4f1126186..50f4bf1ab 100755 --- a/include/execp.cpp +++ b/include/execp.cpp @@ -36,7 +36,11 @@ int TExternal_app::run(bool async, bool utente) TString256 path(_path); if (utente) - path << " -u" << user(); +#if XVT_OS == XVT_OS_WIN + path << " /u" << user(); +#else + path << " -u" << user(); +#endif _error = 0; _exitcode = 0; diff --git a/include/msksheet.cpp b/include/msksheet.cpp index 03fa4d942..fd1e97152 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -1118,7 +1118,7 @@ void TSpreadsheet::str2mask(int riga) TToken_string& r = row(riga); r.restart(); - TString80 val; + TString val(80); for (short id = FIRST_FIELD; ; id++) { int pos = sheet_mask().id2pos(id); diff --git a/include/partite.h b/include/partite.h index 52eee1d32..2ad617646 100755 --- a/include/partite.h +++ b/include/partite.h @@ -1,37 +1,39 @@ -#define PART_ANNO "ANNO" -#define PART_NUMPART "NUMPART" -#define PART_NRIGA "NRIGA" -#define PART_TIPOMOV "TIPOMOV" -#define PART_NREG "NREG" -#define PART_NUMRIG "NUMRIG" -#define PART_DATAREG "DATAREG" -#define PART_DATADOC "DATADOC" -#define PART_NUMDOC "NUMDOC" -#define PART_DESCR "DESCR" -#define PART_REG "REG" -#define PART_PROTIVA "PROTIVA" -#define PART_CODCAUS "CODCAUS" -#define PART_SEZ "SEZ" -#define PART_IMPORTO "IMPORTO" -#define PART_IMPOSTA "IMPOSTA" -#define PART_SPESE "SPESE" -#define PART_CODPAG "CODPAG" -#define PART_CODVAL "CODVAL" -#define PART_CAMBIO "CAMBIO" -#define PART_IMPORTOVAL "IMPORTOVAL" -#define PART_DATACAM "DATACAM" -#define PART_TIPOCF "TIPOCF" -#define PART_GRUPPO "GRUPPO" -#define PART_CONTO "CONTO" -#define PART_SOTTOCONTO "SOTTOCONTO" -#define PART_CODABI "CODABI" -#define PART_CODCAB "CODCAB" -#define PART_CODAG "CODAG" -#define PART_IMPTOTPAG "IMPTOTPAG" -#define PART_RITENUTE "RITENUTE" -#define PART_DATARIFPAG "DATARIFPAG" -#define PART_NUMRIFPAG "NUMRIFPAG" -#define PART_NRATA "NRATA" -#define PART_CHIUSA "CHIUSA" -#define PART_CODABIPR "CODABIPR" -#define PART_CODCABPR "CODCABPR" +#define PART_ANNO "ANNO" +#define PART_NUMPART "NUMPART" +#define PART_NRIGA "NRIGA" +#define PART_TIPOMOV "TIPOMOV" +#define PART_NREG "NREG" +#define PART_NUMRIG "NUMRIG" +#define PART_DATAREG "DATAREG" +#define PART_DATADOC "DATADOC" +#define PART_NUMDOC "NUMDOC" +#define PART_DESCR "DESCR" +#define PART_REG "REG" +#define PART_PROTIVA "PROTIVA" +#define PART_CODCAUS "CODCAUS" +#define PART_SEZ "SEZ" +#define PART_IMPORTO "IMPORTO" +#define PART_IMPOSTA "IMPOSTA" +#define PART_SPESE "SPESE" +#define PART_CODPAG "CODPAG" +#define PART_CODVAL "CODVAL" +#define PART_CAMBIO "CAMBIO" +#define PART_IMPORTOVAL "IMPORTOVAL" +#define PART_DATACAM "DATACAM" +#define PART_TIPOCF "TIPOCF" +#define PART_GRUPPO "GRUPPO" +#define PART_CONTO "CONTO" +#define PART_SOTTOCONTO "SOTTOCONTO" +#define PART_CODABI "CODABI" +#define PART_CODCAB "CODCAB" +#define PART_CODAG "CODAG" +#define PART_IMPTOTPAG "IMPTOTPAG" +#define PART_RITENUTE "RITENUTE" +#define PART_SALACC "SALACC" +#define PART_TIPOPAG "TIPOPAG" +#define PART_DATARIFPAG "DATARIFPAG" +#define PART_NUMRIFPAG "NUMRIFPAG" +#define PART_NRATA "NRATA" +#define PART_CHIUSA "CHIUSA" +#define PART_CODABIPR "CODABIPR" +#define PART_CODCABPR "CODCABPR"