Tolto forced() dal test per il check sul K_ENTER

Corretta set field nel caso di un nome campo = ""


git-svn-id: svn://10.65.10.50/trunk@5097 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1997-08-22 13:32:23 +00:00
parent a3fba6a9ad
commit c3d3c765bf

View File

@ -1372,7 +1372,15 @@ void TEditable_field::set_prompt(const char* p)
void TEditable_field::set_field(const TString& fr) void TEditable_field::set_field(const TString& fr)
{ {
if (_field != NULL) if (_field != NULL)
{
if (fr.empty())
{
delete _field;
_field = NULL;
}
else
*_field = fr; *_field = fr;
}
else else
_field = new TFieldref(fr, 0); _field = new TFieldref(fr, 0);
} }
@ -2992,7 +3000,7 @@ bool TEdit_field::on_key(KEY key)
return FALSE; return FALSE;
} }
if (!mask().query_mode() || forced()) if (!mask().query_mode() /* || forced() */)
{ {
ok = !(check_type() == CHECK_REQUIRED && empty()); ok = !(check_type() == CHECK_REQUIRED && empty());
// check consistency // check consistency