diff --git a/include/lffiles.h b/include/lffiles.h index 3b35ededf..e90ce2d37 100755 --- a/include/lffiles.h +++ b/include/lffiles.h @@ -15,6 +15,8 @@ #define LF_UNLOC 11 #define LF_SOCI 12 #define LF_COMUNI 13 +#define LF_INDSP 16 +#define LF_CFVEN 17 #define LF_OCCAS 18 #define LF_PCON 19 #define LF_CLIFO 20 diff --git a/include/msksheet.cpp b/include/msksheet.cpp index fe5f6d922..58b94888c 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -682,7 +682,7 @@ class TSpreadsheet : public TArray_sheet protected: virtual bool on_key(KEY key); - KEY edit(int n); + KEY edit(int n, KEY tasto); bool notify(int r, KEY k); TMask_field* field(short id) const; @@ -745,7 +745,7 @@ bool TSpreadsheet::on_key(KEY k) k = K_INS; // Inserimento in corso } - edit(n); // Edita riga selezionata o creata + edit(n, k); // Edita riga selezionata o creata set_front_window(win()); // Aggiorna sheet a video open(); @@ -897,7 +897,11 @@ bool TSpreadsheet::notify(int n, KEY k) // Certified 99% -KEY TSpreadsheet::edit(int n) +#if XVT_OS != XVT_OS_WIN +KEY TSpreadsheet::edit(int n, KEY tasto) +#else + KEY TSpreadsheet::edit(int n) +#endif { const int olditems = items(); str2mask(n); @@ -922,7 +926,7 @@ KEY TSpreadsheet::edit(int n) else if (k == K_ESC) { - if (items() > olditems) + if (tasto == K_INS) destroy(n); } #endif