From 5dd564822e4d249a916f4cfbf2e01b22daa0a0b3 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 1 Feb 2008 16:38:43 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : ba8 Ricompilazione Demo : [ ] Commento : Corretto riposizionamento dinamico alberi git-svn-id: svn://10.65.10.50/trunk@16083 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/controls.cpp | 8 ++++++-- include/validate.cpp | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/controls.cpp b/include/controls.cpp index 75f1a4b0b..cbcb02516 100755 --- a/include/controls.cpp +++ b/include/controls.cpp @@ -1002,8 +1002,12 @@ void TControl::set_rect(const RCT& r) { xi_set_rect(_obj, (XinRect*)&r, false); - if (xi_get_native_controls(_obj)) // Dovevano pensarci quelli di XI, ma sono morti! - xvt_vobj_move((WINDOW)_obj->v.btn->btnctl, &r); + if ( _obj->type == XIT_BTN ) + { + // Dovevano pensarci quelli di XI, ma sono morti! + if (xi_get_native_controls(_obj)) + xvt_vobj_move((WINDOW)_obj->v.btn->btnctl, &r); + } } unsigned long TControl::flags2attr(const char* flags) const diff --git a/include/validate.cpp b/include/validate.cpp index cc26eefa1..42be44d77 100755 --- a/include/validate.cpp +++ b/include/validate.cpp @@ -11,7 +11,8 @@ typedef bool (*VAL_FUNC)(TMask_field&, KEY k); HIDDEN const TArray* _parms; -HIDDEN int get_val_param_count() { return _parms->items(); } +HIDDEN int get_val_param_count() +{ return _parms->items(); } HIDDEN const char* get_val_param(int i) { return i >= 0 && i < _parms->items() ? (const char*)((const TString&)(*_parms)[i]) : ""; } @@ -63,7 +64,6 @@ HIDDEN bool _expr_val(TMask_field& f, KEY) return bool(e); } - HIDDEN bool _emptycopy_val(TMask_field& f, KEY) { if (f.empty())