From acd1fe2dac21e327d90c96e8b8e2bc34683f0cca Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 7 Mar 2007 10:02:50 +0000 Subject: [PATCH] Patch level :4.0 649 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 --- include/controls.cpp | 18 ++++++++++++------ include/controls.h | 2 +- include/maskfld.cpp | 6 +++--- include/maskfld.h | 2 +- include/variant.cpp | 5 ----- include/virtkeyb.cpp | 4 ++-- xi/xi.h | 2 +- xi/xi2.c | 2 +- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/controls.cpp b/include/controls.cpp index d790906ab..aab6ece26 100755 --- a/include/controls.cpp +++ b/include/controls.cpp @@ -104,11 +104,17 @@ public: 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) @@ -1182,11 +1188,11 @@ void TControl::set_read_only(bool 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); if (pos >= 0) - xi_aga_field_set_pos(_obj, pos); + xi_aga_field_set_caret_pos(_obj, pos); } const char* TControl::caption() const @@ -1703,7 +1709,7 @@ void TPushbutton_control::set_caption(const char* c) { TControl::set_caption(cap); set_icon(0); - set_bmp(0, 0); + set_bmp(short(0), short(0)); _obj->v.btn->drawable = false; _obj->v.btn->fore_color = color; xi_set_obj_font_id(_obj, xvt_default_font(bold, big)); diff --git a/include/controls.h b/include/controls.h index 0ebb7cfaf..4ebc700c0 100755 --- a/include/controls.h +++ b/include/controls.h @@ -116,7 +116,7 @@ public: virtual void set_rect(const RCT& r); // @cmember imposta la posizione del cursore a - void set_pos(int pos = -1); + void set_caret_pos(int pos = -1); bool on_key(KEY k); }; diff --git a/include/maskfld.cpp b/include/maskfld.cpp index 48e23d295..eec05d566 100755 --- a/include/maskfld.cpp +++ b/include/maskfld.cpp @@ -235,10 +235,10 @@ short TMask_field::atodlg( // @doc EXTERNAL // @mfunc Imposta la posizione -void TMask_field::set_pos( +void TMask_field::set_caret_pos( int pos) // @parm Posizione { - _ctl->set_pos(pos); + _ctl->set_caret_pos(pos); } // @doc EXTERNAL @@ -3138,7 +3138,7 @@ void TEdit_field::parse_head(TScanner& scanner) const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const { const TBrowse* b = NULL; - const pos = mask().id2pos(scanner.integer()); + const int pos = mask().id2pos(scanner.integer()); if (pos >= 0) { const TMask_field& f = mask().fld(pos); diff --git a/include/maskfld.h b/include/maskfld.h index feeb460e0..38c13e61b 100755 --- a/include/maskfld.h +++ b/include/maskfld.h @@ -153,7 +153,7 @@ public: // TObject public: // @cmember Imposta la posizione a - void set_pos(int pos = -1); + void set_caret_pos(int pos = -1); // @cmember Costruisce il campo da file void construct(TScanner& scanner, WINDOW parent); // @cmember Converte una stringa in un identificatore di controllo diff --git a/include/variant.cpp b/include/variant.cpp index 5c756827b..f11d8f5df 100755 --- a/include/variant.cpp +++ b/include/variant.cpp @@ -215,11 +215,6 @@ bool TVariant::is_kind_of(word cid) const 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 { CHECK(s.is_kind_of(CLASS_VARIANT), "Illegal Variant comparison"); diff --git a/include/virtkeyb.cpp b/include/virtkeyb.cpp index eacb1d6be..48bb4162c 100755 --- a/include/virtkeyb.cpp +++ b/include/virtkeyb.cpp @@ -81,7 +81,7 @@ bool TVirtual_keyboard::handler(TMask_field& f, KEY key) } break; } - target.set_pos(pos); + target.set_caret_pos(pos); } return true; } @@ -179,7 +179,7 @@ KEY TVirtual_keyboard::run() init(); set(101, fld().get()); _pos = fld().get().len(); - field(101).set_pos(_pos); + field(101).set_caret_pos(_pos); KEY k = TMask::run(); diff --git a/xi/xi.h b/xi/xi.h index 192ab207d..007a6d67f 100755 --- a/xi/xi.h +++ b/xi/xi.h @@ -1496,7 +1496,7 @@ XIDLL void xi_bitmap_size_get XVT_CC_ARGS( ( XI_BITMAP* bitmap, short* width, short* height ) ); 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); #define xi_bitmap_background_set( bitmap, color ) ((bitmap)->background = (color) ) diff --git a/xi/xi2.c b/xi/xi2.c index 078886d10..e9d36752d 100755 --- a/xi/xi2.c +++ b/xi/xi2.c @@ -474,7 +474,7 @@ xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c ) } 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 ) {