From c50f740fee83db146c99aac7a8080355582fc724 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 25 Jul 1997 13:11:55 +0000 Subject: [PATCH] maskfld.cpp Corretto ordine degli hits nella do_output msksheet.cpp Aggiunto off_cell_handler sul doppio click git-svn-id: svn://10.65.10.50/trunk@4918 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/maskfld.cpp | 23 ++++++++++++++++++++--- include/msksheet.cpp | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/maskfld.cpp b/include/maskfld.cpp index c029a51f2..6d6ffedac 100755 --- a/include/maskfld.cpp +++ b/include/maskfld.cpp @@ -2035,9 +2035,12 @@ void TBrowse::do_output(CheckTime t) TToken_string flds(24, '+'); const TRelation& relation = *_cursor->relation(); - - _out_fn.restart(); - for (const char* fld = _out_id.get(0); fld && *fld; fld = _out_id.get()) + + TBit_array spotted; + + _out_fn.restart(); + const char* fld; + for (fld = _out_id.get(0); fld && *fld; fld = _out_id.get()) { const short id = field().atodlg(fld); TMask_field& f = field(id); @@ -2075,11 +2078,25 @@ void TBrowse::do_output(CheckTime t) hit = TRUE; } } +/* if (hit) { f.check(); f.on_hit(); } +*/ + spotted.set(id, hit); + } + } + + for (fld = _out_id.get(0); fld && *fld; fld = _out_id.get()) + { + const short id = field().atodlg(fld); + if (spotted[id]) + { + TMask_field& f = field(id); + f.check(); + f.on_hit(); } } diff --git a/include/msksheet.cpp b/include/msksheet.cpp index 197f7e4bc..a60b22efc 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -1069,6 +1069,7 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev) refused = TRUE; break; case XIE_DBL_CELL: + if (off_cell_handler()) { _check_enabled = FALSE;