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

Aggiunto modulo PA a modaut

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22959 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2014-06-24 12:41:15 +00:00
parent 15ceb346c3
commit 9f0c6387d2
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/applicat.cpp
View File

@ -88,10 +88,17 @@ HIDDEN void paint_background(WINDOW win)
if (ADVANCED_GRAPHICS) if (ADVANCED_GRAPHICS)
{ {
/*
const int ix = xvt_vobj_get_attr(win, ATTR_ICON_WIDTH); const int ix = xvt_vobj_get_attr(win, ATTR_ICON_WIDTH);
const int iy = xvt_vobj_get_attr(win, ATTR_ICON_HEIGHT); const int iy = xvt_vobj_get_attr(win, ATTR_ICON_HEIGHT);
xvt_dwin_draw_icon(win, r.right-ix-CHARY, r.bottom-iy-CHARY, ICON_RSRC); xvt_dwin_draw_icon(win, r.right-ix-CHARY, r.bottom-iy-CHARY, ICON_RSRC);
xvt_dwin_draw_icon(win, CHARY, r.bottom-iy-CHARY, ICON_RSRC); xvt_dwin_draw_icon(win, CHARY, r.bottom-iy-CHARY, ICON_RSRC);
*/
RCT ir;
xvt_rect_set(&ir, CHARY, r.bottom-TOOL_SIZE-CHARY, TOOL_SIZE+CHARY, r.bottom-CHARY);
xvt_dwin_draw_icon_rect(win, &ir, ICON_RSRC);
xvt_rect_set(&ir, r.right-CHARY-TOOL_SIZE, r.bottom-TOOL_SIZE-CHARY, r.right-CHARY, r.bottom-CHARY);
xvt_dwin_draw_icon_rect(win, &ir, ICON_RSRC);
} }
} }

8
include/form.cpp
View File

@ -1066,7 +1066,10 @@ bool TForm_string::read()
const TRelation* r = form().relation(); const TRelation* r = form().relation();
CHECK(r, "Can't read from null relation"); CHECK(r, "Can't read from null relation");
for (int i = 0; i < _field.items() && *s == '\0'; i++) for (int i = 0; i < _field.items() && *s == '\0'; i++)
s = field(i).read(*r); {
const TFieldref& fi = field(i);
s = fi.read(*r);
}
set(s); set(s);
} }
} }
@ -1075,7 +1078,8 @@ bool TForm_string::read()
void TForm_string::put_paragraph(const char* s) void TForm_string::put_paragraph(const char* s)
{ {
if (hidden()) return; if (hidden())
return;
const int h = height(); const int h = height();

2
include/modaut.h
View File

@ -22,7 +22,7 @@
#define INAUT 18 #define INAUT 18
#define POAUT 19 #define POAUT 19
#define ABAUT 20 #define ABAUT 20
//#define GVAUT 21 #define PAAUT 21
#define CAAUT 22 #define CAAUT 22
#define SLAUT 23 #define SLAUT 23
#define ICAUT 24 #define ICAUT 24

1
include/nditte.h
View File

@ -10,6 +10,7 @@
#define NDT_TEL "TEL" #define NDT_TEL "TEL"
#define NDT_PFAX "PFAX" #define NDT_PFAX "PFAX"
#define NDT_FAX "FAX" #define NDT_FAX "FAX"
#define NDT_MAIL "MAIL"
#define NDT_NULC "NULC" #define NDT_NULC "NULC"
#define NDT_ARTIG "ARTIG" #define NDT_ARTIG "ARTIG"
#define NDT_NISCRAA "NISCRAA" #define NDT_NISCRAA "NISCRAA"

13
include/varrec.cpp
View File

@ -225,8 +225,7 @@ void TVariable_rectype::set_memo_fld(const char* fieldname)
void TVariable_rectype::init_memo(TRecnotype recno, TIsam_handle file) void TVariable_rectype::init_memo(TRecnotype recno, TIsam_handle file)
{ {
TRectype::init_memo(recno, file); TRectype::init_memo(recno, file);
if (recno != RECORD_NON_FISICO) _memo_fld_to_load = recno != RECORD_NON_FISICO && _memo_fld.full();
_memo_fld_to_load = _memo_fld.not_empty();
} }
TObject* TVariable_rectype::dup() const TObject* TVariable_rectype::dup() const
@ -251,8 +250,9 @@ TFieldtypes TVariable_rectype::type(const char* fieldname) const
int TVariable_rectype::length(const char* fieldname) const int TVariable_rectype::length(const char* fieldname) const
{ {
if (_virtual_fields.objptr(fieldname)) const TVariable_field* vf = (const TVariable_field*)_virtual_fields.objptr(fieldname);
return ((TVariable_field *)_virtual_fields.objptr(fieldname))->lenght(); if (vf != NULL)
return vf->lenght();
return TRectype::length(fieldname); return TRectype::length(fieldname);
} }
@ -318,11 +318,10 @@ const TString & TVariable_rectype::get_str(const char* fieldname) const
void TVariable_rectype::put_str(const char* fieldname, const char* val) void TVariable_rectype::put_str(const char* fieldname, const char* val)
{ {
TVariable_field* f = (TVariable_field*)_virtual_fields.objptr(fieldname); TVariable_field* f = (TVariable_field*)_virtual_fields.objptr(fieldname);
if (f == NULL && auto_virtual_fields() && !TRectype::exist(fieldname)) if (f == NULL && auto_virtual_fields() && !TRectype::exist(fieldname))
{ {
_virtual_fields.add(fieldname, TVariable_field(fieldname)); f = new TVariable_field(fieldname);
f = (TVariable_field *) _virtual_fields.objptr(fieldname); _virtual_fields.add(fieldname, f);
} }
if (f) if (f)
f->put(val); f->put(val);