From aaef37e7fb58bd2607621c1c6c6d5d6a3eb41306 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 14 Feb 2008 16:40:57 +0000 Subject: [PATCH] Patch level : 4.0 Files correlati : ba8 Ricompilazione Demo : [ ] Commento : Corretta gestione albero dei report git-svn-id: svn://10.65.10.50/trunk@16174 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1100.cpp | 7 ++++--- ba/ba8300.cpp | 6 ++++-- ba/ba8301.cpp | 11 +++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp index bed5e561e..e5b33c084 100755 --- a/ba/ba1100.cpp +++ b/ba/ba1100.cpp @@ -119,7 +119,7 @@ TManutenzione_app::TManutenzione_app() : _browse(NULL), _mask(NULL), _firm(0), _ #endif if (handle != -1) { - if (write( handle, (char*)fd, sizeof(FileDes)) == -1) + if (write( handle, fd, sizeof(FileDes)) == -1) fatal_box("Impossibile scrivere il file dir.gen per dati standard: errore %d",errno); close(handle); } @@ -1392,12 +1392,11 @@ void TManutenzione_app::load_des(const int maxfdir) void TManutenzione_app::update() { - bool ok = false; - TIsamfile utenti(LF_USER); utenti.open(_excllock); #ifndef DBG + bool ok = false; while (!ok) { TToken_string utonti(64, ','); @@ -1419,6 +1418,8 @@ void TManutenzione_app::update() break; } } +#else + bool ok = true; #endif // Scrive CONVERTING solo dopo aver testato che non ci sia nessuno connesso if (ok) diff --git a/ba/ba8300.cpp b/ba/ba8300.cpp index b4c662b0d..edb70fd8e 100755 --- a/ba/ba8300.cpp +++ b/ba/ba8300.cpp @@ -834,9 +834,11 @@ bool TReport_mask::add_section() } if (level > 0) { - _tree.goto_node(type, level); - tfield(F_SECTIONS).select_current(); _curr_section = &_report.section(type, level); + _tree.goto_node(type, level); + _tree.expand_all(); + TTree_field& tf = tfield(F_SECTIONS); + tf.win().force_update(); section_properties(); } else diff --git a/ba/ba8301.cpp b/ba/ba8301.cpp index 01898fdab..b3747c011 100755 --- a/ba/ba8301.cpp +++ b/ba/ba8301.cpp @@ -374,9 +374,13 @@ TImage* TReport_tree::image(bool selected) const else id += 3; // Subsection (pulcino) } - return get_res_image(id); } - return TTree::image(selected); + else + { + if (has_son()) + id = selected ? 178 : 177; + } + return id > 0 ? get_res_image(id) : TTree::image(selected); } int TReport_tree::image_height() const @@ -500,8 +504,7 @@ TReport_base_mask::TReport_base_mask(const char* name, TReport& rep) _font_changed(false), _halign('C'), _valign('C'), _fgcolor(COLOR_BLACK), _bgcolor(COLOR_WHITE) -{ -} +{ } /////////////////////////////////////////////////////////// // TReport_field_mask