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

default.url Aggiunto discardable alle icone ed ai cursori

Browse Source 
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
This commit is contained in:
guy 1995-11-27 08:39:18 +00:00
parent 7e7aec3dea
commit 1b4bb30c66
10 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/default.url
View File

@ -96,10 +96,10 @@ image BMP_DOC "f:/p.due/bmp/doc.bmp"
#scan <xil.h>
#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

13
include/form.cpp
View File

@ -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();

5
include/form.h
View File

@ -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;

2
include/mask.h
View File

@ -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);

3
include/relation.cpp
View File

@ -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 <prefix.h>
#include <relation.h>
#include <sheet.h>
#include <sort.h>
#include <tabutil.h>
#include <utility.h>
#include <xvtility.h>

8
include/relation.h
View File

@ -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 <sort.h>
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); }

8
include/sheet.cpp
View File

@ -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)
{

24
include/sheet.h
View File

@ -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 <mf TSheet::page_build>)
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();
{}
};

18
include/sort.cpp
View File

@ -1,22 +1,8 @@
#include <extcdecl.h>
#include <isam.h>
#include <sort.h>
#ifndef __EXTCDECL_H
#include <extcdecl.h>
#endif
#ifndef __CHECKS_H
#include <checks.h>
#endif
//#include <ccommon.h>
//#include <ccustio.h>
//#include <cfiles.h>
//#include <cbpltree.h>
//#include <cisam.h>
//#include <csort.h>
TSort::TSort(int len)
{
_sortvar = new s_prm;
_sortvar->rc_len = len;

7
include/sort.h
View File

@ -5,10 +5,6 @@
#include <object.h>
#endif
#ifndef __ISAM_H
#include <isam.h>
#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