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

Risolto conflitto su short y() const

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2289 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-12-14 13:17:26 +00:00
parent 5a02356a3a
commit fd090303fc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/form.h
View File

@ -43,9 +43,9 @@ class TForm : public TObject
friend class TForm_editor; friend class TForm_editor;
friend class TPrint_section; friend class TPrint_section;
TString16 _name; // Profile name TString _name; // Profile name
TString16 _code; // Profile code TString _code; // Profile code
TString80 _fontname; // Font name TString _fontname; // Font name
int _fontsize; // Font size int _fontsize; // Font size
int _x, _y; // Offset validi per tutte le sezioni int _x, _y; // Offset validi per tutte le sezioni
char _char_to_pos; // Carattere utilizzato per il posizionamento dei moduli char _char_to_pos; // Carattere utilizzato per il posizionamento dei moduli
@ -143,7 +143,7 @@ public:
TForm_item& find_field(char sec, pagetype pag, short id) const; TForm_item& find_field(char sec, pagetype pag, short id) const;
int& offset_x() { return _x; } int& offset_x() { return _x; }
int& offset_y() { return _y; } int& offset_y() { return _y; }
TString80& fontname() { return _fontname; } TString& fontname() { return _fontname; }
int& fontsize() { return _fontsize; } int& fontsize() { return _fontsize; }
char& char_to_pos(){ return _char_to_pos; } char& char_to_pos(){ return _char_to_pos; }
int& ipx() { return _ipx; } int& ipx() { return _ipx; }
@ -317,9 +317,11 @@ public:
virtual int height() const { return _height; } virtual int height() const { return _height; }
virtual short& ofs() { return _ofs; } virtual short& ofs() { return _ofs; }
virtual int effective_height() const { return _effective_height; } virtual int effective_height() const { return _effective_height; }
virtual short& x() { return _x; }; virtual short& x() { return _x; };
virtual short x() const; virtual short x() const;
virtual short& y() { return _y; } virtual short& y() { return _y; }
virtual short y() const { return _y; }
bool shown() const { return _flag.shown; } bool shown() const { return _flag.shown; }
bool hidden() const { return !_flag.shown; } bool hidden() const { return !_flag.shown; }