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

Patch level :4.0 649

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :errori di compilazione nel riporto


git-svn-id: svn://10.65.10.50/trunk@14995 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-03-07 10:02:50 +00:00
parent 046e2c06cb
commit acd1fe2dac
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/controls.cpp
View File

@ -104,11 +104,17 @@ public:
short TPicture_array::add(const char * n) short TPicture_array::add(const char * n)
{ {
short id; short id; // calcola il prossimo identificatore di immagine libero
for (id = 30000; _enabled.objptr(id) != NULL; id++);
for (id = 30000; objptr(id) != NULL; id++); TImage* i = new TImage(n);
_enabled.add(i, id);
return TArray::add(new TImage(n), id); TImage* d = new TImage(*i);
d->fade_to_gray(COLOR_GRAY);
_disabled.add(d, id);
return id;
} }
bool TPicture_array::add(short id) bool TPicture_array::add(short id)
@ -1182,11 +1188,11 @@ void TControl::set_read_only(bool on)
change_attrib(XI_ATR_READONLY, on); change_attrib(XI_ATR_READONLY, on);
} }
void TControl::set_pos(int pos) void TControl::set_caret_pos(int pos)
{ {
xi_lowlevel_focus(_obj, TRUE); xi_lowlevel_focus(_obj, TRUE);
if (pos >= 0) if (pos >= 0)
xi_aga_field_set_pos(_obj, pos); xi_aga_field_set_caret_pos(_obj, pos);
} }
const char* TControl::caption() const const char* TControl::caption() const
@ -1703,7 +1709,7 @@ void TPushbutton_control::set_caption(const char* c)
{ {
TControl::set_caption(cap); TControl::set_caption(cap);
set_icon(0); set_icon(0);
set_bmp(0, 0); set_bmp(short(0), short(0));
_obj->v.btn->drawable = false; _obj->v.btn->drawable = false;
_obj->v.btn->fore_color = color; _obj->v.btn->fore_color = color;
xi_set_obj_font_id(_obj, xvt_default_font(bold, big)); xi_set_obj_font_id(_obj, xvt_default_font(bold, big));

2
include/controls.h
View File

@ -116,7 +116,7 @@ public:
virtual void set_rect(const RCT& r); virtual void set_rect(const RCT& r);
// @cmember imposta la posizione del cursore a <pos> // @cmember imposta la posizione del cursore a <pos>
void set_pos(int pos = -1); void set_caret_pos(int pos = -1);
bool on_key(KEY k); bool on_key(KEY k);
}; };

6
include/maskfld.cpp
View File

@ -235,10 +235,10 @@ short TMask_field::atodlg(
// @doc EXTERNAL // @doc EXTERNAL
// @mfunc Imposta la posizione // @mfunc Imposta la posizione
void TMask_field::set_pos( void TMask_field::set_caret_pos(
int pos) // @parm Posizione int pos) // @parm Posizione
{ {
_ctl->set_pos(pos); _ctl->set_caret_pos(pos);
} }
// @doc EXTERNAL // @doc EXTERNAL
@ -3138,7 +3138,7 @@ void TEdit_field::parse_head(TScanner& scanner)
const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const
{ {
const TBrowse* b = NULL; const TBrowse* b = NULL;
const pos = mask().id2pos(scanner.integer()); const int pos = mask().id2pos(scanner.integer());
if (pos >= 0) if (pos >= 0)
{ {
const TMask_field& f = mask().fld(pos); const TMask_field& f = mask().fld(pos);

2
include/maskfld.h
View File

@ -153,7 +153,7 @@ public: // TObject
public: public:
// @cmember Imposta la posizione a <pos> // @cmember Imposta la posizione a <pos>
void set_pos(int pos = -1); void set_caret_pos(int pos = -1);
// @cmember Costruisce il campo da file // @cmember Costruisce il campo da file
void construct(TScanner& scanner, WINDOW parent); void construct(TScanner& scanner, WINDOW parent);
// @cmember Converte una stringa in un identificatore di controllo // @cmember Converte una stringa in un identificatore di controllo

5
include/variant.cpp
View File

@ -215,11 +215,6 @@ bool TVariant::is_kind_of(word cid) const
return cid == CLASS_VARIANT || TSortable::is_kind_of(cid); return cid == CLASS_VARIANT || TSortable::is_kind_of(cid);
} }
void TVariant::print_on(ostream& out) const
{
out << as_string();
}
int TVariant::compare(const TSortable& s) const int TVariant::compare(const TSortable& s) const
{ {
CHECK(s.is_kind_of(CLASS_VARIANT), "Illegal Variant comparison"); CHECK(s.is_kind_of(CLASS_VARIANT), "Illegal Variant comparison");

4
include/virtkeyb.cpp
View File

@ -81,7 +81,7 @@ bool TVirtual_keyboard::handler(TMask_field& f, KEY key)
} }
break; break;
} }
target.set_pos(pos); target.set_caret_pos(pos);
} }
return true; return true;
} }
@ -179,7 +179,7 @@ KEY TVirtual_keyboard::run()
init(); init();
set(101, fld().get()); set(101, fld().get());
_pos = fld().get().len(); _pos = fld().get().len();
field(101).set_pos(_pos); field(101).set_caret_pos(_pos);
KEY k = TMask::run(); KEY k = TMask::run();

2
xi/xi.h
View File

@ -1496,7 +1496,7 @@ XIDLL void xi_bitmap_size_get XVT_CC_ARGS( ( XI_BITMAP* bitmap, short* width,
short* height ) ); short* height ) );
XIDLL BOOLEAN xi_bitmap_draw_all_on_resize XVT_CC_ARGS( ( XI_BITMAP* bitmap ) ); XIDLL BOOLEAN xi_bitmap_draw_all_on_resize XVT_CC_ARGS( ( XI_BITMAP* bitmap ) );
XIDLL void xi_aga_field_set_pos( XI_OBJ * xi_obj, int pos ); XIDLL void xi_aga_field_set_caret_pos( XI_OBJ * xi_obj, int pos );
XIDLL void xi_lowlevel_focus( XI_OBJ * xi_obj, BOOLEAN set); XIDLL void xi_lowlevel_focus( XI_OBJ * xi_obj, BOOLEAN set);
#define xi_bitmap_background_set( bitmap, color ) ((bitmap)->background = (color) ) #define xi_bitmap_background_set( bitmap, color ) ((bitmap)->background = (color) )

2
xi/xi2.c
View File

@ -474,7 +474,7 @@ xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c )
} }
void void
xi_aga_field_set_pos( XI_OBJ * xi_obj, int pos ) xi_aga_field_set_caret_pos( XI_OBJ * xi_obj, int pos )
{ {
if ( xi_obj->type == XIT_FIELD ) if ( xi_obj->type == XIT_FIELD )
{ {