From 438a204712d893cffc4da0a17384cd2e34ba4d9b Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 13 Dec 2021 12:02:07 +0100 Subject: [PATCH] Patch level : nopatch Files correlati : Commento : corretti i check dei brwbut --- src/include/brwbut.cpp | 2 +- src/include/brwbut.h | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/include/brwbut.cpp b/src/include/brwbut.cpp index bbe8adb4d..f376aaad3 100644 --- a/src/include/brwbut.cpp +++ b/src/include/brwbut.cpp @@ -1740,7 +1740,7 @@ void TReport_select::set_report_class(const char * classe) _classe = classe; list_custom_files("rep", _classe, reps); if (reps.items()) - field().set(reps[0]); + field().set(reps[0].get()); else field().set(""); } diff --git a/src/include/brwbut.h b/src/include/brwbut.h index 3cf337925..331fa91da 100644 --- a/src/include/brwbut.h +++ b/src/include/brwbut.h @@ -31,10 +31,11 @@ public: // @cmember Controlla la validita' del campo virtual bool check(CheckTime = RUNNING_CHECK) pure; - virtual bool is_browse() const { return false; } - virtual bool is_sheet() const { return false; } - virtual bool is_filesel() const { return false; } - virtual bool is_profile() const { return false; } + virtual bool is_browse() const { return false; } + virtual bool is_sheet() const { return false; } + virtual bool is_filesel() const { return false; } + virtual bool is_profile() const { return false; } + virtual bool is_reportsel() const { return false; } TBrowse_button(TEdit_field* f); virtual ~TBrowse_button(); @@ -158,7 +159,6 @@ protected: // @access Public Member public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_BROWSE_BUTTON; } // @cmember Modifica il display void custom_display(); @@ -319,8 +319,6 @@ protected: virtual TCursor& cursor(); public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_FBROWSE_BUTTON; } - virtual bool check(CheckTime = RUNNING_CHECK); virtual KEY run(); virtual long find(const TString& val); @@ -336,7 +334,6 @@ protected: virtual TCursor& cursor(); public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_ABROWSE_BUTTON; } virtual KEY run(); TAlternative_browse(TEdit_field* ef, int altkey); @@ -348,7 +345,6 @@ class TFile_select : public TBrowse_button TFilename _filter; public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_FSELECT_BUTTON; } // @cmember Controlla la sintassi della input del campo e ne setta i membri virtual void parse_input(TScanner& scanner); @@ -369,7 +365,6 @@ public: class TDir_select : public TBrowse_button { public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_DSELECT_BUTTON; } // @cmember Controlla la sintassi della input del campo e ne setta i membri virtual void parse_input(TScanner& scanner); @@ -393,7 +388,6 @@ class TReport_select : public TBrowse_button public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_RSELECT_BUTTON; } // @cmember Controlla la sintassi della input del campo e ne setta i membri virtual void parse_input(TScanner& scanner); @@ -406,6 +400,7 @@ public: virtual bool check(CheckTime = RUNNING_CHECK); virtual bool is_filesel() const { return true; } + virtual bool is_reportsel() const { return true; } void set_report_class(const char * classe); const TString & get_report_class() const { return _classe; } @@ -425,7 +420,6 @@ protected: virtual void parse_output(TScanner& scanner); public: - virtual bool is_kind_of(word cid) const { return cid == CLASS_PSELECT_BUTTON; } virtual KEY run(); // @cmember Controlla la validita' del campo