From 2a5d62664827620605ea831960a753f9e225acb9 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Thu, 2 Feb 2017 19:05:20 +0000 Subject: [PATCH] Patch level : 12.0 338 Files correlati : cg4.exe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non considerava piĆ¹ i corrispettivi nell'IVA a debito Controllare anche il pro_rata. git-svn-id: svn://10.65.10.50/branches/R_10_00@23576 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/include/progind.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/include/progind.cpp b/src/include/progind.cpp index 1bb787596..494727896 100755 --- a/src/include/progind.cpp +++ b/src/include/progind.cpp @@ -370,6 +370,8 @@ void TProgress_monitor::set_max(long tot) bool TProgress_monitor::is_cancelled() const { return _cancelled; } +static WINDOW topwin = NULL; + TProgress_monitor::TProgress_monitor(long items, const char* txt, bool cancancel) : _total(items), _txt(txt), _status(0), _cancellable(cancancel), _pd(NULL_WIN), _start(clock()), _cancelled(false) @@ -377,6 +379,7 @@ TProgress_monitor::TProgress_monitor(long items, const char* txt, bool cancancel xvt_scr_set_busy_cursor(); if (_pm_parent == NULL_WIN) { + topwin = xvt_scr_get_focus_topwin(); _pm_parent = cur_win(); if (_pm_parent == NULL_WIN) _pm_parent = TASK_WIN; @@ -399,4 +402,11 @@ TProgress_monitor::~TProgress_monitor() xvt_dm_progress_destroy(_pd); else xvt_scr_reset_busy_cursor(); + CHECK("top_win NULL", topwin != NULL_WIN); + if (_pm_inst <= 0 && topwin != NULL_WIN) + { + xvt_scr_set_focus_vobj(topwin); + xvt_vobj_raise(topwin); + topwin = NULL_WIN; + } }