mask.cpp Azzerato anche focusdirty e non solo dirty in reset della maschera
msksheet.cpp Forzato update in reset dello spreadsheet git-svn-id: svn://10.65.10.50/trunk@2181 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
f00c721229
commit
199ef85a71
@ -1126,12 +1126,12 @@ void TMask::show_page(int p)
|
||||
|
||||
void TMask::reset(short fld_id)
|
||||
{
|
||||
if (fld_id < 1)
|
||||
if (fld_id <= 0)
|
||||
{
|
||||
for (int f = 0; f < fields(); f++)
|
||||
{
|
||||
TMask_field& c = fld(f);
|
||||
c._flags.dirty = FALSE;
|
||||
c._flags.dirty = c._flags.focusdirty = FALSE;
|
||||
c.reset();
|
||||
}
|
||||
}
|
||||
|
@ -1014,9 +1014,12 @@ void TSpreadsheet::list_handler(XI_EVENT *xiev)
|
||||
{
|
||||
case E_FOCUS:
|
||||
if (_check_enabled && ep->v.active == FALSE)
|
||||
{
|
||||
{
|
||||
if (!mask().is_running())
|
||||
_row_dirty = _cell_dirty = FALSE;
|
||||
|
||||
const bool ok = (bool)xi_move_focus(_itf);
|
||||
if (!ok && mask().is_running())
|
||||
if (!ok)
|
||||
{
|
||||
set_dirty(3);
|
||||
xiev->refused = TRUE;
|
||||
@ -1737,6 +1740,7 @@ void TSheet_field::reset()
|
||||
{
|
||||
_sheet->destroy();
|
||||
_sheet->sheet_mask().reset();
|
||||
force_update();
|
||||
}
|
||||
|
||||
// Certified 100%
|
||||
|
Loading…
x
Reference in New Issue
Block a user