root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tolto forced() dal test per il check sul K_ENTER

Browse Source 
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
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/maskfld.cpp
View File

@ -1371,8 +1371,16 @@ void TEditable_field::set_prompt(const char* p)
// Certified 90% // Certified 90%
void TEditable_field::set_field(const TString& fr) void TEditable_field::set_field(const TString& fr)
{ {
if (_field != NULL) if (_field != NULL)
*_field = fr; {
if (fr.empty())
{
delete _field;
_field = NULL;
}
else
*_field = fr;
}
else else
_field = new TFieldref(fr, 0); _field = new TFieldref(fr, 0);
} }
@ -2435,7 +2443,7 @@ bool TBrowse::check(CheckTime t)
const TMaskmode mode = (TMaskmode)field().mask().mode(); const TMaskmode mode = (TMaskmode)field().mask().mode();
CheckType chk = field().check_type(); CheckType chk = field().check_type();
if (chk == CHECK_REQUIRED && (t == STARTING_CHECK || mode == MODE_QUERY)) if (chk == CHECK_REQUIRED && (t == STARTING_CHECK || mode == MODE_QUERY))
chk = CHECK_NORMAL; chk = CHECK_NORMAL;
const int ne = do_input(TRUE); const int ne = do_input(TRUE);
@ -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