Corretto conflitto precedente

git-svn-id: svn://10.65.10.50/trunk@74 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1994-08-26 14:33:08 +00:00
parent 61cb7ebabe
commit fff1daf8af
2 changed files with 378 additions and 381 deletions

View File

@ -1,4 +1,4 @@
// $Id: maskfld.cpp,v 1.5 1994-08-26 14:05:29 alex Exp $
// $Id: maskfld.cpp,v 1.6 1994-08-26 14:33:08 alex Exp $
#include <xvt.h>
#include <applicat.h>
@ -1163,9 +1163,6 @@ int TBrowse::do_input(bool filter)
_cursor->setfilter(work);
_cursor->setregion(filtrec, filtrec);
if (filtrec.empty()) _cursor->filter(w);
else _cursor->filter(w, &filtrec, &filtrec);
return ne;
}