From 1b4bb30c669b8a184b347d70f6bc2b0b494fec57 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 27 Nov 1995 08:39:18 +0000 Subject: [PATCH] default.url Aggiunto discardable alle icone ed ai cursori form.* Resi virtuali i metodi sul cursore e la relazione principale mask.h Resa virtuale la on_firm_change relation.cpp Eliminata include di sort.h sheet.* Aggiunto metodo cursor() e reso nuovamente privato _cursor sort.* Eliminata include di isam.h git-svn-id: svn://10.65.10.50/trunk@2207 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/default.url | 10 +++++----- include/form.cpp | 13 +++++++------ include/form.h | 5 ++--- include/mask.h | 2 +- include/relation.cpp | 3 ++- include/relation.h | 8 +++++--- include/sheet.cpp | 8 ++++---- include/sheet.h | 24 ++++++++++++++++-------- include/sort.cpp | 18 ++---------------- include/sort.h | 7 ++----- 10 files changed, 46 insertions(+), 52 deletions(-) diff --git a/include/default.url b/include/default.url index ef6216dd8..b4b0cfedb 100755 --- a/include/default.url +++ b/include/default.url @@ -96,10 +96,10 @@ image BMP_DOC "f:/p.due/bmp/doc.bmp" #scan #transparent $$$ -XI_CURSOR_RESIZE cursor f:/p.due/bmp/resize.cur -XI_CURSOR_HAND cursor f:/p.due/bmp/hand.cur -XI_CURSOR_VRESIZE cursor f:/p.due/bmp/vresize.cur -COMBO_ICON icon f:/p.due/bmp/combo.ico -ICO_SEARCH icon f:/p.due/bmp/search.ico +XI_CURSOR_RESIZE CURSOR DISCARDABLE f:/p.due/bmp/resize.cur +XI_CURSOR_HAND CURSOR DISCARDABLE f:/p.due/bmp/hand.cur +XI_CURSOR_VRESIZE CORSOR DISCARDABLE f:/p.due/bmp/vresize.cur +COMBO_ICON ICON DISCARDABLE f:/p.due/bmp/combo.ico +ICO_SEARCH ICON DISCARDABLE f:/p.due/bmp/search.ico $$$ #endif diff --git a/include/form.cpp b/include/form.cpp index 25ba4d8be..85eb475e5 100755 --- a/include/form.cpp +++ b/include/form.cpp @@ -1001,7 +1001,8 @@ bool TForm_string::read() if (_field.items() != 0) { const char* s = ""; - const TRelation* r = form().relation(); + const TRelation* r = form().relation(); + CHECK(r, "Can't read from null relation"); for (int i = 0; i < _field.items() && *s == '\0'; i++) s = field(i).read(r); set(s); @@ -2470,7 +2471,7 @@ void TForm::arrange_form() long TForm::records() const { - const long r = _cursor ? _cursor->items() : 0; + const long r = cursor() ? cursor()->items() : 0; return r; } @@ -2551,7 +2552,7 @@ bool TForm::print(long from, long to) for (long i = from; i <= to && ok; i++) { if (from < 0) to = from; - else if (_cursor) *_cursor = i; + else if (cursor()) *cursor() = i; const word h = set_body(page(pr), FALSE); if (h > pr.rows_left()) @@ -2562,7 +2563,7 @@ bool TForm::print(long from, long to) if (i == lastrec) { - if (_cursor) *_cursor = i; + if (cursor()) *cursor() = i; _lastpage = TRUE; set_background(0, TRUE); set_header(0, TRUE); @@ -2778,7 +2779,7 @@ TForm::TForm(const char* name, const char* code, int lev, const char* desc) { main_app().begin_wait(); - if (_code != "") + if (_code.not_empty()) { // extract base form name TLocalisamfile forms(LF_FORM); @@ -2833,7 +2834,7 @@ TForm::TForm(const char* name, const char* code, int lev, const char* desc) ok = ps->parse(scanner); // Parse section } - if (_code != "") + if (_code.not_empty()) read_profile(); // read from LF_RFORM file main_app().end_wait(); diff --git a/include/form.h b/include/form.h index 650edbae9..ec9d60052 100755 --- a/include/form.h +++ b/include/form.h @@ -178,10 +178,9 @@ public: bool edit_level() const { return _editlevel; } void set_description(const char* s) { _desc = s; } - TRelation* relation() const { return _relation; } + virtual TRelation* relation() const { return _relation; } + virtual TCursor* cursor() const { return _cursor; } TRelation_description& rel_desc() const; - - TCursor* cursor() const { return _cursor; } virtual bool validate(TForm_item& fld, TToken_string& val); TForm_item& find_field(char sec, pagetype pag, short id) const; diff --git a/include/mask.h b/include/mask.h index 7cca9d25b..902ce1a85 100755 --- a/include/mask.h +++ b/include/mask.h @@ -258,7 +258,7 @@ public: virtual void on_idle(); // @cmember Aggiorna in tutti campi della maschera, che fanno riferimento ad una ditta, // con il riferimento alla ditta attuale - void on_firm_change(); + virtual void on_firm_change(); // @cmember Abilita/disabilita un campo virtual void enable(short fld_id, bool on = TRUE); diff --git a/include/relation.cpp b/include/relation.cpp index d173eec5e..a5c8d6cb8 100755 --- a/include/relation.cpp +++ b/include/relation.cpp @@ -1,4 +1,4 @@ -// $Id: relation.cpp,v 1.70 1995-11-22 13:55:00 matteo Exp $ +// $Id: relation.cpp,v 1.71 1995-11-27 08:39:02 guy Exp $ // relation.cpp // fv 12/8/93 // relation class for isam files @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/include/relation.h b/include/relation.h index 4d6b4681a..36df38652 100755 --- a/include/relation.h +++ b/include/relation.h @@ -1,4 +1,4 @@ -/* $Id: relation.h,v 1.30 1995-11-22 13:55:07 matteo Exp $ */ +/* $Id: relation.h,v 1.31 1995-11-27 08:39:10 guy Exp $ */ // join.h // fv 12/8/93 // join class for isam files @@ -11,7 +11,7 @@ #endif #ifndef __SORT_H -#include +class TSort; #endif class TRelation : public TObject @@ -53,9 +53,11 @@ public: virtual int last(TReclock lockop = _nolock) { return file().last(lockop) == NOERR ? position_rels(_isequal, lockop) : file().status(); } virtual int skip(TRecnotype nrec, TReclock lockop = _nolock) { return file().skip(nrec, lockop) == NOERR ? position_rels(_isequal, lockop) : file().status(); } virtual int read(TIsamop op = _isgteq, TReclock lockop = _nolock, TDate& atdate = (TDate&)botime) { return file().read(op, lockop, atdate) == NOERR ? position_rels(_isequal, lockop, atdate) : file().status();} - + TLocalisamfile& lfile(int logicnum = 0) const; TLocalisamfile& lfile(const char* name) const; + TLocalisamfile& operator[] (int logicnum) const { return lfile(logicnum); } + void write_enable(int logicnum = 0, const bool on = TRUE) ; void write_enable(const char* name, const bool on = TRUE) ; void write_disable(int logicnum = 0) { write_enable(logicnum, FALSE); } diff --git a/include/sheet.cpp b/include/sheet.cpp index 5670528ad..01bf5e3ac 100755 --- a/include/sheet.cpp +++ b/include/sheet.cpp @@ -895,17 +895,17 @@ bool TBrowse_sheet::on_key(KEY k) else field().set_field_data(val); ((TBrowse*)field().browse())->do_input(FALSE); - _cursor->read(); - if (_cursor->file().bad()) + cursor()->read(); + if (cursor()->file().bad()) { beep(); val = old; if (corre) xvt_vobj_set_title(fldwin, (char*)(const char*)val); else field().set_field_data(val); - *_cursor = oldsel; + *cursor() = oldsel; } else - select(_cursor->pos()); + select(cursor()->pos()); if (ctl != NULL_WIN) { diff --git a/include/sheet.h b/include/sheet.h index 6e0abc780..811a1c08a 100755 --- a/include/sheet.h +++ b/include/sheet.h @@ -247,26 +247,34 @@ class TCursor_sheet : public TSheet // @cmember Numero del records collegato al cursore long _records; - // @access Protected Member -protected: // @cmember Cursore da cui prelevare i dati TCursor* _cursor; + // @access Protected Member +protected: // TSheet // @cmember Costruisce la pgaina (vedi ) virtual void page_build(long first, byte rows); + + // @access Public Member +public: // TSheet + // @cmember Ritorna il numero dei records del cursore + virtual long items() const + { return _records; } + + // @cmember Lancia la finestra con lo sheet + virtual KEY run(); // @access Public Member public: + // @cmember Ritorna il cursore + TCursor* cursor() const + { return _cursor; } + // @cmember Costruttore TCursor_sheet(TCursor* cursor, const char* fields, const char* title, const char* head, byte buttons = 0); // @cmember Distruttore virtual ~TCursor_sheet() - {} - // @cmember Ritorna il numero del records collegato al cursore - virtual long items() const - { return _records; } - // @cmember Lancia la finestra con lo sheet - virtual KEY run(); + {} }; diff --git a/include/sort.cpp b/include/sort.cpp index 20b802923..6c59dfea2 100755 --- a/include/sort.cpp +++ b/include/sort.cpp @@ -1,22 +1,8 @@ +#include +#include #include -#ifndef __EXTCDECL_H -#include -#endif - -#ifndef __CHECKS_H -#include -#endif - -//#include -//#include -//#include -//#include -//#include -//#include - TSort::TSort(int len) - { _sortvar = new s_prm; _sortvar->rc_len = len; diff --git a/include/sort.h b/include/sort.h index 1c03bcadf..b9df36d10 100755 --- a/include/sort.h +++ b/include/sort.h @@ -5,10 +5,6 @@ #include #endif -#ifndef __ISAM_H -#include -#endif - // @doc EXTERNAL // @class TSort | Classe per l'ordinamento di strutture o di record @@ -18,7 +14,7 @@ class TSort : public TObject // @author:(INTERNAL) Alex { // @friend TRecfield - friend TRecfield; + friend class TRecfield; // @access Private Member @@ -54,4 +50,5 @@ public: // @cmember Distruttore virtual ~TSort(); }; + #endif // __SORT_H