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

Patch level : nopatch

Browse Source 
Files correlati     :
Commento        :

corretti i check dei brwbut
This commit is contained in:
Alessandro Bonazzi 2021-12-13 12:53:39 +01:00
parent eb0249c3c9
commit fa0215234f
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/maskfld.cpp
View File

@ -2811,16 +2811,19 @@ bool TEdit_field::on_key(KEY key)
{ {
ok = !(check_type() == CHECK_REQUIRED && empty()); ok = !(check_type() == CHECK_REQUIRED && empty());
// check consistency // check consistency
if (!ok && _browse != nullptr && _browse->is_kind_of(CLASS_RSELECT_BUTTON)) if (!ok && _browse != nullptr && _browse->is_reportsel())
ok = true; ok = true;
if (ok && _browse) if (ok && _browse != nullptr)
{ {
if (browse() && !_browse->is_kind_of(CLASS_RSELECT_BUTTON)) if (browse() != nullptr && !_browse->is_reportsel())
{ {
if (ok && check_enabled() && vf != 21) // 21 = NOT_EMPTY_CHECK_FIELD if (ok && check_enabled() && vf != 21 && !_browse->is_filesel() && !_browse->is_profile()) // 21 = NOT_EMPTY_CHECK_FIELD
{ {
if (dirty()) ok = browse()->check(FINAL_CHECK); // Check consistency
else ok = browse()->empty_check(); if (dirty())
ok = browse()->check(FINAL_CHECK); // Check consistency
else
ok = browse()->empty_check();
} }
} }
else else

12
src/include/maskfld.h
View File

@ -934,17 +934,17 @@ public:
virtual bool check(CheckTime = RUNNING_CHECK); virtual bool check(CheckTime = RUNNING_CHECK);
// @cmember Ritorna l'oggetto browse // @cmember Ritorna l'oggetto browse
TBrowse* browse() const TBrowse * browse() const { return (_browse && _browse->is_browse()) ? (TBrowse *)_browse : NULL; }
{ return (_browse && _browse->is_browse()) ? (TBrowse*)_browse : NULL; }
// @cmember Ritorna l'oggetto sheet // @cmember Ritorna l'oggetto sheet
TList_sheet* sheet() const TList_sheet * sheet() const { return (_browse && _browse->is_sheet()) ? (TList_sheet *)_browse : NULL;}
{ return (_browse && _browse->is_sheet()) ? (TList_sheet*)_browse : NULL;}
// @cmember Ritorna l'oggetto dir sheet // @cmember Ritorna l'oggetto dir sheet
TFile_select* filesel() const TFile_select * filesel() const { return (_browse && _browse->is_filesel()) ? (TFile_select*)_browse : NULL;}
{ return (_browse && _browse->is_filesel()) ? (TFile_select*)_browse : NULL;}
// @cmember Ritorna l'oggetto report sheet
TReport_select * reportsel() const{ return (_browse && _browse->is_reportsel()) ? (TReport_select *)_browse : NULL;
}
// @cmember Permette di abilitare/disabilitare il campo // @cmember Permette di abilitare/disabilitare il campo
virtual void enable(bool on = true); virtual void enable(bool on = true);