From fa0215234f523f40a3a551487ff9b18b7b415d48 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 13 Dec 2021 12:53:39 +0100 Subject: [PATCH] Patch level : nopatch Files correlati : Commento : corretti i check dei brwbut --- src/include/maskfld.cpp | 15 +++++++++------ src/include/maskfld.h | 16 ++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/include/maskfld.cpp b/src/include/maskfld.cpp index dd1d21926..e91a2c512 100755 --- a/src/include/maskfld.cpp +++ b/src/include/maskfld.cpp @@ -2811,16 +2811,19 @@ bool TEdit_field::on_key(KEY key) { ok = !(check_type() == CHECK_REQUIRED && empty()); // check consistency - if (!ok && _browse != nullptr && _browse->is_kind_of(CLASS_RSELECT_BUTTON)) + if (!ok && _browse != nullptr && _browse->is_reportsel()) 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 diff --git a/src/include/maskfld.h b/src/include/maskfld.h index 56ce937af..3294a99ba 100755 --- a/src/include/maskfld.h +++ b/src/include/maskfld.h @@ -934,18 +934,18 @@ public: virtual bool check(CheckTime = RUNNING_CHECK); // @cmember Ritorna l'oggetto browse - TBrowse* browse() const - { return (_browse && _browse->is_browse()) ? (TBrowse*)_browse : NULL; } + TBrowse * browse() const { return (_browse && _browse->is_browse()) ? (TBrowse *)_browse : NULL; } // @cmember Ritorna l'oggetto sheet - TList_sheet* sheet() const - { return (_browse && _browse->is_sheet()) ? (TList_sheet*)_browse : NULL;} + TList_sheet * sheet() const { return (_browse && _browse->is_sheet()) ? (TList_sheet *)_browse : NULL;} - // @cmember Ritorna l'oggetto dirsheet - TFile_select* filesel() const - { return (_browse && _browse->is_filesel()) ? (TFile_select*)_browse : NULL;} + // @cmember Ritorna l'oggetto dir sheet + TFile_select * filesel() const { return (_browse && _browse->is_filesel()) ? (TFile_select*)_browse : NULL;} - // @cmember Permette di abilitare/disabilitare il campo + // @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 virtual void enable(bool on = true); // @cmember Permette di abilitare/disabilitare il check del campo