From 62f7840f0da5b1f748f8a4588b8c61e7afd95ce1 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 17 Oct 2003 08:20:13 +0000
Subject: [PATCH] Patch level         : 2.0 694 Files correlati     : cg2.exe
 Ricompilazione Demo : [ ] Commento            :

Correzioni necessarie per pagamenti in prima nota


git-svn-id: svn://10.65.10.50/trunk@11507 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/config.cpp  | 13 +++----------
 include/config.h    |  2 +-
 include/strings.cpp |  8 +++-----
 include/window.cpp  |  8 ++++----
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/include/config.cpp b/include/config.cpp
index 13a6b707c..56bff379f 100755
--- a/include/config.cpp
+++ b/include/config.cpp
@@ -557,8 +557,7 @@ word TConfig::items(
 // @mfunc Inizializza il paragrafo leggendo dal file i dati
 void TConfig::init(
   const char *fn,  // @parm Nome del file da leggere
-  const char* pa,  // @parm Nome del paragrafo da utilizzare
-  bool warning)    // @parm Segnala assenza del file
+  const char* pa)  // @parm Nome del paragrafo da utilizzare
 
   // @comm Apre il file <p fn> e cerca il paragrafo <p pa>. Se il file non esiste
   //       viene creato con il paragrafo passato.
@@ -570,8 +569,6 @@ void TConfig::init(
   
   if (!_file.exist())
   {
-    if (warning)
-      warning_box("Creazione del file di configurazione %s", fn );
     ofstream c(fn);
     c.close();
   }
@@ -781,18 +778,14 @@ TConfig::TConfig(int which_config, const char* paragraph)
     NFCHECK("Chi usa questo strano .ini?");
     break;
   }  
-#ifdef DBG
-  init(_file, paragraph, TRUE);  // Segnala warning solo in debug
-#else  
-  init(_file, paragraph, FALSE);
-#endif      
+  init(_file, paragraph);
 }
 
 TConfig::TConfig(const char *fn, const char* pa)
 {
   TFilename f(fn);
   f.custom_path();
-  init(f, pa, FALSE); 
+  init(f, pa); 
 }
 
 TConfig::~TConfig()
diff --git a/include/config.h b/include/config.h
index 5c5fc0b04..f3f6f0792 100755
--- a/include/config.h
+++ b/include/config.h
@@ -78,7 +78,7 @@ protected:
   // @cmember Scrive il file di configurazione
   void _write_file();
   // @cmember Inizializza il paragrafo leggendo dal file di nome <p fn > i dati
-  void init(const char *fn, const char* pa, bool warning);
+  void init(const char *fn, const char* pa);
 
   // @access Public Memeber
 public:
diff --git a/include/strings.cpp b/include/strings.cpp
index ef7defc79..688db9487 100755
--- a/include/strings.cpp
+++ b/include/strings.cpp
@@ -1301,12 +1301,10 @@ bool TFilename::custom_path(const char* path_list)
     {
       if (prefix_valid())
       {
-        pl = firm2dir(prefix().get_codditta());
-	      pl << SLASH << "custom";
-        pl.add(firm2dir(-1));
-	      pl << "custom";
+        pl = firm2dir(prefix().get_codditta());   // f:/campo/dati/00001A
+        pl.add(firm2dir(-1)); pl << "custom";     // f:/campo/dati/custom
       }
-      pl.add("custom");
+      pl.add("custom");                           // c:/campo/custom  
     }
     const TString fname = name();
     FOR_EACH_TOKEN(pl, path)
diff --git a/include/window.cpp b/include/window.cpp
index b7065af49..3a97f2101 100755
--- a/include/window.cpp
+++ b/include/window.cpp
@@ -224,15 +224,16 @@ void TWindow_manager::unreg(const TWindow* m)
   }  
   else
   {
-    cur_win()->activate();
+    TWindow& w = *cur_win();
+    w.activate();
     
     xvt_menu_set_item_enabled(TASK_WIN, M_FILE_QUIT, _current == 0);
-    
     const bool cf = _current == 0 && main_app().firm_change_enabled();
     xvt_menu_set_item_enabled(TASK_WIN, M_FILE_NEW, cf);
     
     xvt_menu_update(TASK_WIN);
-    cur_win()->set_focus();
+    w.set_focus();
+    w.force_update();
   }     
 }
 
@@ -439,7 +440,6 @@ KEY TWindow::run()
   	xvt_sys_sleep(50);
 	}
 
-
   if (!was_open) 
     close_modal();
   do_events();