diff --git a/include/varmask.cpp b/include/varmask.cpp index 5c11a1898..180af84a8 100755 --- a/include/varmask.cpp +++ b/include/varmask.cpp @@ -75,94 +75,5 @@ TVariable_sheet_field::~TVariable_sheet_field() _getmask(0, m, TRUE); // Distrugge la maschera customizzata } -KEY TVariable_sheet_field::run_editmask(int n) -{ - if(!_getmask) - return TSheet_field::run_editmask(n); // Esegue la maschera dello sheet_field - - - TMask& totalmask = TSheet_field::sheet_mask(); - TMask& usermask = *_getmask( n, totalmask, FALSE ); - - // Carico la maschera dell'utente con la maschera totale -/* - usermask.copy_values(totalmask); - - const int ncampi = usermask.fields(); - - for (int i = 0; i < ncampi; i++) - { - TMask_field& f = usermask.fld(i); - const short id = f.dlg( ); - - if (id >= FIRST_FIELD) - { - const int index = (id % 100) - 1; - const bool on = active() ? !cell_disabled(n, index) : FALSE; - - f.enable(on); - if (f.class_id() != CLASS_BUTTON_FIELD && - (f.active() || f.ghost())) - { - if (f.has_check()) - f.check(STARTING_CHECK); - f.set_dirty(FALSE); - f.on_hit(); - } - else - if (f.dirty() == TRUE) - f.set_dirty(FALSE); - } - } -*/ - - KEY k = usermask.run(); - -/* - // Carico la maschera totale con la maschera dell'utente - if (k == K_ENTER) - totalmask.copy_values(usermask); -// _getmask( n, totalmask, TRUE ); -*/ - return k; -} - -// Ricopia i campi della maschera nel record dato -void TVariable_sheet_field::mask2row(int n, TToken_string & rec) -{ - TSheet_field::mask2row(n,rec); -} - -// Ricopia i campi del record dato nella maschera -void TVariable_sheet_field::row2mask(int n, TToken_string & rec) -{ -/* - TString val(80); - - if ( _getmask != NULL) - { - TMask &m= TSheet_field::sheet_mask(); // Maschera completa dello sheet - const int ncampi = m.fields(); - - for (int i = 0; i < ncampi; i++) - { - TMask_field& f = m.fld(i); - const short id = f.dlg( ); - - if (id >= FIRST_FIELD) - { - const int index = (id % 100) - 1; - const bool on = active() ? !cell_disabled(n, index) : FALSE; - - val = rec.get(index); - f.set(val); - } - } - m.set_caption(format("Riga %d", n+1)); - } - else - */ - TSheet_field::row2mask(n,rec); -} diff --git a/include/varmask.h b/include/varmask.h index 54a5050ac..73de572c8 100755 --- a/include/varmask.h +++ b/include/varmask.h @@ -57,10 +57,6 @@ class TVariable_sheet_field : public TSheet_field SPREADSHEET_GETMASK _getmask; protected: - // @cmember Ricopia i campi della maschera nel record

-esimo - virtual void mask2row(int n, TToken_string & rec); - // @cmember Ricopia i campi del record

-esimo nella maschera - virtual void row2mask(int n, TToken_string & rec); public: @@ -68,8 +64,6 @@ public: void set_getmask(SPREADSHEET_GETMASK n) { _getmask = n; } - // @cmember esegue la maschera di edit dello speadsheet; - virtual KEY run_editmask(int n); // @cmember Ritorna la maschera corrispondente ad una riga dello spreadsheet virtual TMask& sheet_mask() const;