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

Patch level : 12.0 284

Browse Source 
Files correlati     : 770.exe f39.trr f39.dir
Commento            :
maskfld.h & maskfld.cpp:
- Aggiunti metodi is_kind_of per i TEdit_field
relapp.cpp:
- Corretto bug nel tasto precedente e successivo. Non controllava che i campi fossero TEdit_field quando richiamava la browse


git-svn-id: svn://10.65.10.50/branches/R_10_00@23296 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2016-09-20 08:53:48 +00:00
parent dccd97dab2
commit 7357bc871e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/maskfld.cpp
View File

@ -2041,6 +2041,9 @@ TEdit_field::~TEdit_field()
word TEdit_field::class_id() const word TEdit_field::class_id() const
{ return CLASS_EDIT_FIELD; } { return CLASS_EDIT_FIELD; }
bool TEdit_field::is_kind_of(word cid) const
{ return cid == CLASS_EDIT_FIELD || TEditable_field::is_kind_of(cid); }
void TEdit_field::set_len(short w) void TEdit_field::set_len(short w)
{ {
@ -2072,7 +2075,6 @@ void TEdit_field::parse_head(TScanner& scanner)
_ctl_data._width = _ctl_data._size; _ctl_data._width = _ctl_data._size;
} }
const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const
{ {
const TBrowse* b = NULL; const TBrowse* b = NULL;

1
src/include/maskfld.h
View File

@ -857,6 +857,7 @@ public:
// @cmember Ritorna l'identificatore della classe // @cmember Ritorna l'identificatore della classe
virtual word class_id() const; virtual word class_id() const;
virtual bool is_kind_of(word cid) const;
// @cmember Legge un item del controllo dal file <p scanner> // @cmember Legge un item del controllo dal file <p scanner>
virtual bool parse_item(TScanner& scanner); virtual bool parse_item(TScanner& scanner);
// @cmember Gestisce la chiamata all'handler del campo // @cmember Gestisce la chiamata all'handler del campo

4
src/include/relapp.cpp
View File

@ -1554,7 +1554,7 @@ void TRelation_application::main_loop()
{ {
for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE)) for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE))
{ {
if (e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check if (e->is_kind_of(CLASS_EDIT_FIELD) && e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check
{ {
TCursor* b = e->browse()->cursor(); TCursor* b = e->browse()->cursor();
@ -1593,7 +1593,7 @@ void TRelation_application::main_loop()
{ {
for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE)) for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE))
{ {
if (e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check if (e->is_kind_of(CLASS_EDIT_FIELD) && e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check
{ {
TCursor* b = e->browse()->cursor(); TCursor* b = e->browse()->cursor();