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

Aggiunto check_search

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2321 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-12-19 15:55:50 +00:00
parent 60b57890ed
commit 1c17b5bcc1
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/maskfld.cpp
View File

@ -1808,10 +1808,17 @@ bool TBrowse::check(CheckTime t)
do_output(t); do_output(t);
} }
else else
{ {
do_clear(); if (t == CHECK_SEARCH)
if (!_fld->mask().query_mode() && _fld->check_enabled()) {
_fld->set_dirty(3); passed = TRUE;
}
else
{
do_clear();
if (!_fld->mask().query_mode() && _fld->check_enabled())
_fld->set_dirty(3);
}
} }
} }
} }
@ -1910,9 +1917,10 @@ bool TEdit_field::parse_item(TScanner& scanner)
if (scanner.key() == "CH") if (scanner.key() == "CH")
{ {
scanner.pop(); scanner.pop();
if (scanner.key() == "NO") _check = CHECK_NORMAL; if (scanner.key() == "NO") _check = CHECK_NORMAL; else
else if (scanner.key() == "RE") _check = CHECK_REQUIRED; if (scanner.key() == "RE") _check = CHECK_REQUIRED; else
else if (scanner.key() == "FO") {_check = CHECK_REQUIRED; _forced = TRUE;} if (scanner.key() == "FO") { _check = CHECK_REQUIRED; _forced = TRUE; } else
if (scanner.key() == "SE") _check = CHECK_SEARCH;
else _check = CHECK_NONE; else _check = CHECK_NONE;
return TRUE; return TRUE;
} }

4
include/maskfld.h
View File

@ -29,7 +29,9 @@ typedef bool (*CONTROL_HANDLER)(TMask_field& field, KEY key);
enum CheckType { enum CheckType {
CHECK_NONE, // @emem Nessun controllo CHECK_NONE, // @emem Nessun controllo
CHECK_NORMAL, // @emem Controllo normale (non e' un campo obbligatorio) CHECK_NORMAL, // @emem Controllo normale (non e' un campo obbligatorio)
CHECK_REQUIRED }; // @emem Controlla se il campo non e' vuoto e fa un check normale CHECK_REQUIRED, // @emem Controlla se il campo non e' vuoto e fa un check normale
CHECK_SEARCH // @emem Controlla se il campo c'e' ma non da' nessuna segnalazione se e' errato
};
// @enum Momento di richiesta del check // @enum Momento di richiesta del check
enum CheckTime { enum CheckTime {