Patch level : xx no patch

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Correzzione relaitive al riporto precedente


git-svn-id: svn://10.65.10.50/trunk@9672 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba0.cpp

@@ -234,7 +234,7 @@ TPicture_mask::TPicture_mask(const char* name, int dx, int dy,
   set_image(image);
   
   reload_images();
-  _euro_timer = xvt_timer_create(win(), 100);
+  _euro_timer = xvt_timer_create(win(), 50);
 }
 
 TPicture_mask::~TPicture_mask()

ba/ba0200a.uml

@@ -65,11 +65,6 @@ BEGIN
   PROMPT 36 5 "Sfondo"
 END
 
-BOOLEAN 113
-BEGIN
-  PROMPT 1 7 "Campi 3D"
-END
-
 GROUPBOX DLG_NULL 14 5
 BEGIN
   PROMPT 35 7 "@bBottone"

ba/ba1100.cpp

@@ -32,7 +32,7 @@ bool movable_file(int file)
          file == LF_RCAUSALI || file == LF_CFVEN || file == LF_INDSP;
 }
 
-class TManutenzione_app : public TApplication
+class TManutenzione_app : public TSkeleton_application
 {
   TDir_sheet* _browse;
   TArray _dirs;
@@ -45,7 +45,7 @@ class TManutenzione_app : public TApplication
   FILE * _log;
 
 protected:
-  virtual bool menu (MENU_TAG);
+  virtual void main_loop();
   virtual bool create () ;
   virtual bool destroy();
   void insert_riga(long, TToken_string&);
@@ -305,7 +305,6 @@ void TManutenzione_app::print()
 bool TManutenzione_app::create() // initvar e arrmask
 
 {
-  TApplication::create();
 
   _firm = get_firm();
   TString sw(argc()>2 ? argv(2) : "");
@@ -365,7 +364,7 @@ bool TManutenzione_app::create() // initvar e arrmask
     dispatch_e_menu(BAR_ITEM(1));
   }
   enable_menu_item(M_FILE_PRINT);
-  return TRUE ;
+  return TSkeleton_application::create();
 }
 
 bool TManutenzione_app::destroy() // releasev e arrmask
@@ -780,7 +779,7 @@ void TManutenzione_app::delete_riga ()
   r.put(logicnum);
 }
 
-ool TManutenzione_app::recover(TSystemisamfile& f, int err)
+bool TManutenzione_app::recover(TSystemisamfile& f, int err)
 {
   if (err == -60 || err == -64 || err == _ispatherr ||
       (err > -600 && err <= -300))
@@ -836,6 +835,7 @@ void TManutenzione_app::update_dir()
   // trattasi di files PRASSI, (ad esempio i cespiti) che da noi non vengono toccati,
   // in modo da evitare colpe inutili. Noi aggiorniamo solo i tracciati su dir e trc,
   // ma il file fisico manco lo tocchiamo!!
+  TString80 s;
   const TString pref(prefix().name());
   const bool is_com = prefix().is_com();
 
@@ -909,7 +909,6 @@ void TManutenzione_app::update_dir()
       {                 
         if (old_is_firm && !movable_file(i) && d.eod() == 0L)
         {
-          TString80 s;
           TFilename n(d.filename());
           
           save_file(n);
@@ -1193,6 +1192,7 @@ void TManutenzione_app::convert_dir()
 							write_log(s);
 						}
 					}
+				}
 
         //d.get(i, _nolock, _nordir, _sysdirop);
         bool to_create = (is_com ? d.is_com() : d.is_firm());
@@ -1258,7 +1258,6 @@ void TManutenzione_app::convert_dir()
       r.put(i);
     }
   }
-//  prefix().set(pref);
   d.get(LF_DIR, _nolock, _nordir, _sysdirop);
   d.flags() = _level;
   d.put(LF_DIR, _nordir, _sysdirop);
@@ -1547,7 +1546,7 @@ void TManutenzione_app::update()
   end_wait();
 }
 
-bool TManutenzione_app::menu(MENU_TAG m)
+void TManutenzione_app::main_loop()
 {
   TToken_string riga;
   long  riga_selezionata;
@@ -1614,7 +1613,6 @@ bool TManutenzione_app::menu(MENU_TAG m)
     enable_menu_item(M_FILE_NEW);
   }
 
-  return xvt_test_menu_tag(BAR_ITEM(2));
 }
 
 int ba1100(int argc, char** argv)

ba/ba1100d.uml

@@ -13,8 +13,7 @@ END
 
 BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -25 -1 "~Stampa"
+  PROMPT -25 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_EXPORT 10 2

ba/ba1200.cpp

@@ -7,19 +7,19 @@
 // Testfil
 ///////////////////////////////////////////////////////////
 
-class TTest_application : public TApplication
+class TTest_application : public TSkeleton_application
 {
 
 protected:
-  bool create() { dispatch_e_menu(BAR_ITEM(1)); return TRUE; }
+  bool create() { dispatch_e_menu(BAR_ITEM(1)); return TSkeleton_application::create(); }
   bool destroy() { return TRUE; }
-  bool menu(MENU_TAG);
+  virtual void main_loop();
 
 public:
   TTest_application() {}
 };
 
-bool TTest_application::menu(MENU_TAG)
+void TTest_application::main_loop()
 {            
   TLocalisamfile tab(LF_COMUNI);
   const TRecnotype n = tab.items();
@@ -44,8 +44,6 @@ bool TTest_application::menu(MENU_TAG)
 	const clock_t t = clock() - start;
 	msg.format("%ld records in %ld msec\n%lg records per sec", r, t, 1000.0*r/t);             
 	message_box(msg);
-
-return TRUE;
 }
 
 ///////////////////////////////////////////////////////////

ba/ba1300.cpp

@@ -7,7 +7,6 @@
 
 #include "ba1.h"
 
-
 class TPackFiles_application:public TSkeleton_application
 {
   TArray_sheet   * _selsheet;

ba/ba1500.cpp

@@ -251,7 +251,7 @@ void TRequest_form::print_footer()
 // TAttivazione_moduli
 ///////////////////////////////////////////////////////////
 
-class TAttivazione_moduli : public TApplication
+class TAttivazione_moduli : public TSkeleton_application
 {
   TMask* _msk;
   TInformazione_moduli* _im;
@@ -262,8 +262,8 @@ class TAttivazione_moduli : public TApplication
 protected:
   virtual bool create() ;                         
   virtual bool destroy() ;                        
-  virtual bool use_files() const { return FALSE; }
+//  virtual bool use_files() const { return FALSE; }
-  virtual bool menu(MENU_TAG);
+  virtual void main_loop();
   
   void garble(word k[4]) const;
   void garble(word n, TString& str) const;
@@ -1497,8 +1497,7 @@ bool TAttivazione_moduli::create()
              
   enable_menu_item(M_FILE_PG_SETUP);
   enable_menu_item(M_FILE_PRINT);
-  dispatch_e_menu(BAR_ITEM(1));
+  return TSkeleton_application::create();
-  return TRUE;
 }
 
 bool TAttivazione_moduli::destroy()
@@ -1508,13 +1507,12 @@ bool TAttivazione_moduli::destroy()
   return TRUE;
 }
 
-bool TAttivazione_moduli::menu(MENU_TAG)
+void TAttivazione_moduli::main_loop()
 {
   KEY res = _msk->run();
   if (res == K_ENTER)
     burn_dongle();
 
-  return FALSE;
 }
 
 int ba1500(int argc, char** argv)

ba/ba2.url

@@ -1,8 +1,10 @@
 #include <default.url>
+#include <mainmenu.url>
 
+/*
 MENUBAR TASK_MENUBAR
 
-#define MENU_FILE_ALT TASK_MENUBAR+4000
+#define MENU_FILE_ALT MENUBAR+4000
 
 #define M_FIL1_NEW    MENU_FILE_ALT+101
 #define M_FIL1_OPEN   MENU_FILE_ALT+102
@@ -19,7 +21,6 @@ SEPARATOR
 ITEM M_FIL1_QUIT   "~Fine"
 */
 
-
 MENUBAR MENU_BAR(0)
 
 MENU MENU_BAR(0)
@@ -64,9 +65,10 @@ MENU BAR_ITEM(1)
   ITEM MENU_ITEM(53) "~Primo"
   ITEM MENU_ITEM(54) "~Ultimo"
 
+/*
 MENUBAR MENU_BAR(1)
 
-  MENU TASK_MENUBAR+1
+  MENU MENU_BAR(1)
   SUBMENU M_FILE "~File"  
 
 
@@ -84,6 +86,7 @@ MENU BAR_ITEM(1)
 
   MENU MENU_BAR(4)
   SUBMENU M_FILE "~File"
+*/
 
 MENUBAR MENU_BAR(5)
 

ba/ba2200.cpp

@@ -15,7 +15,7 @@
 #include "ba2200.h"
 #include "ba2201.h"
 
-struct TFile_info : public TObject
+struct TAFile_info : public TObject
 { 
   TFilename _name;
   long _size;
@@ -165,7 +165,7 @@ KEY TArchive_app::query(int& mode, long& firm, TFilename& floppy_path, TString&
 
 void TArchive_app::add_file(const TFilename& name)
 {
-  TFile_info* fi = new TFile_info;
+  TAFile_info* fi = new TAFile_info;
   fi->_name = name;
   fi->_size = fsize(name);
   fi->_disk = fi->_last_disk = 1;
@@ -266,7 +266,7 @@ void TArchive_app::save_zip_files(const TFilename& floppy_path, const TString& d
   unsigned long written = 0;
   for (int i = 0; i < _zip_list.items(); i++)
   {
-    TFile_info& fi = (TFile_info&)_zip_list[i];
+    TAFile_info& fi = (TAFile_info&)_zip_list[i];
     if (written > 0 && (written+fi._size) >= max_chunk)
     {
       disk++;
@@ -301,7 +301,7 @@ void TArchive_app::save_zip_files(const TFilename& floppy_path, const TString& d
   long size = 0;
   for (i = 0; i < _zip_list.items(); i++)
   {
-    const TFile_info& fi = (const TFile_info&)_zip_list[i];
+    const TAFile_info& fi = (const TAFile_info&)_zip_list[i];
     name = fi._name.name(); name.ext("");
     if (name != last_name)
     {
@@ -320,7 +320,7 @@ void TArchive_app::save_zip_files(const TFilename& floppy_path, const TString& d
   for (i = 0; i < _zip_list.items(); i++)
   {
     pi.addstatus(1);
-    const TFile_info& fi = (const TFile_info&)_zip_list[i];
+    const TAFile_info& fi = (const TAFile_info&)_zip_list[i];
     if (fi._disk != curr_disk)
       message_box("Inserire il disco vuoto n.%d", curr_disk = fi._disk);
     TFilename dest;
@@ -426,7 +426,7 @@ bool TArchive_app::read_paragraph(TConfig& ini, const char* para)
     int e = 0;
     for (int d = first; d <= last; d++)
     {
-      TFile_info* fi = new TFile_info;
+      TAFile_info* fi = new TAFile_info;
       TFilename& name = fi->_name;
       ext.format("z%02d", e++);
       name = dir; name.add(para); name.ext(ext);
@@ -448,7 +448,7 @@ void TArchive_app::load_zip_files(const TFilename& floppy_path)
   int curr_disk = 1;          
   for (int i = 0; i < files; i++)
   {            
-    const TFile_info& info = (const TFile_info&)_zip_list[i];
+    const TAFile_info& info = (const TAFile_info&)_zip_list[i];
     const int& disk = info._disk;
 
     msg = "Ripristino "; msg << info._name.name() << " in corso...";
@@ -532,7 +532,7 @@ void TArchive_app::restore(int mode, long firm, const TFilename& floppy_path)
     fola = "Verranno ripristinati i seguenti archivi:\n";
     for (int i = 0; i < tot; i++)
     {
-      const TFile_info& info = (const TFile_info&)_zip_list[i];
+      const TAFile_info& info = (const TAFile_info&)_zip_list[i];
       if (info._disk == info._last_disk)
       {
         TFilename n = info._name.name();
@@ -622,12 +622,12 @@ void TArchive_app::main_loop()
   if (argc() > 2)
   {
     TFilename ini = argv(2);
-    if (ini.compare("/i", TRUE, 2) == 0)
+    if (ini.compare("/i", 2, TRUE) == 0) // qui
     {
       ini.ltrim(2);
       TConfig cfg(ini, "Main");
       cmd = cfg.get("Action");
-      if (cmd.compare("Restore ", TRUE, 8) == 0)
+      if (cmd.compare("Restore ", 8, TRUE) == 0) //qui
       {
         cmd.ltrim(8);
         cmd.trim();

ba/ba2300.cpp

@@ -182,8 +182,8 @@ static int compare_lessons(const TObject** o1, const TObject** o2)
 {
   const TFilename f1 = *(const TString*)*o1;
   const TFilename f2 = *(const TString*)*o2;
-  const TString8 s1 = f1.name();
+  const TString80 s1 = f1.name();
-  const TString8 s2 = f2.name();
+  const TString80 s2 = f2.name();
   int cmp = s1.compare(s2, 4, TRUE);
   if (cmp == 0)
     cmp = s2[4] - s1[4];

ba/ba2500.cpp

@@ -11,7 +11,7 @@
 
 #include "ba2500.h"
 
-class TStampa_deleghe_IVA : public TApplication
+class TStampa_deleghe_IVA : public TSkeleton_application
 {
   TRelation *_nditte;
   TTable* _banche;
@@ -30,7 +30,7 @@ class TStampa_deleghe_IVA : public TApplication
 protected:
   virtual bool create();
   virtual bool destroy();
-  virtual bool menu(MENU_TAG);
+  virtual void main_loop();
   virtual void print();
 
   char frequenza_versamenti(long firm, int year) const;
@@ -45,7 +45,6 @@ public:
 
 bool TStampa_deleghe_IVA::create()
 {
-  TApplication::create();
 
   _nditte = new TRelation(LF_NDITTE);
   _nditte->add(LF_ANAG, "TIPOA=TIPOA|CODANAGR=CODANAGR");
@@ -59,8 +58,8 @@ bool TStampa_deleghe_IVA::create()
   _azienda = "" ;
   _dipendenza = "" ;
   
-  dispatch_e_menu(BAR_ITEM(1));
+  return TSkeleton_application::create();
-  return TRUE;
+
 }
 
 bool TStampa_deleghe_IVA::destroy()
@@ -173,12 +172,11 @@ int TStampa_deleghe_IVA::select()
   return res;
 }
 
-bool TStampa_deleghe_IVA::menu(MENU_TAG)
+void TStampa_deleghe_IVA::main_loop()
 {
   int s;
   while ((s = select()) != 0)
     if (s == 1) print();
-  return FALSE;
 }
 
 void TStampa_deleghe_IVA::print()

ba/ba2600.cpp

@@ -1247,12 +1247,17 @@ void TEditMask_button::type_button(const TString& id,const TString& pr)
 {
     if(pr=="")
     {
-      if(id=="DLG_NULL") ;
+//      if(id=="DLG_NULL") ;
       if(id=="DLG_OK")     set_prompt("Conferma") ;
+			else
 				if(id=="DLG_CANCEL") set_prompt("Annulla");
+				else
 					if(id=="DLG_DELREC") set_prompt("Elimina");
+					else
 						if(id=="DLG_QUIT")   set_prompt("Fine");    
+						else
 				      if(id=="DLG_PRINT")  set_prompt("Stampa");
+							else
 								if(id=="DLG_SELECT") set_prompt("Seleziona");
     }
 }
@@ -2614,7 +2619,8 @@ void TEditMask_window::selected_crt(WINDOW win, EVENT* ep)
 //Converte da pixel a caratteri
 PNT& TEditMask_window::logic(const PNT& p, bool& intool)
 {
-   RCT r; PNT pnt;
+	 static PNT pnt;
+   RCT r; 
    const int MAXX=640;
    
    xvt_vobj_get_client_rect(win(), &r);  //client_area
@@ -3012,7 +3018,7 @@ bool TEditMask_window::read_tool(TScanner& scanner)
      
   _name.add(scanner.string(),0);
   set_toolbar(TRUE);  
-  scanner.rectangle(_rt);
+  scanner.rectangle(_rt.left, _rt.top, _rt.right, _rt.bottom);
   _y_tool=_rt.top;
   if (_y_tool < 0)
    _y_tool = _y_tool + 22;
@@ -3247,7 +3253,7 @@ void TMaskEditor_application::open_mask()
 
   TFilename in;
   
-  if (_dirty && !_save && yesno_box("Salvare la maschera corrente?") == K_YES)
+  if (_dirty && _save && yesno_box("Salvare la maschera corrente?"))
     save_as_mask();
   
   _dirty = _save = FALSE;

ba/ba3.cpp

@@ -27,5 +27,6 @@ int main(int argc, char** argv)
   default:
     ba3100(argc,argv); break;
   }
+	exit(0);
   return 0;
 }

ba/ba3200.cpp

@@ -490,7 +490,7 @@ bool BA3200_application::preprocess_print(int file, int counter)
 void BA3200_application::destroy_objects() 
 {
   if (_msk) delete _msk;
-  if (_cur) delete _cur;
+//  if (_cur) delete _cur;
   if (_rel) delete _rel;
 }
 

ba/ba3600a.uml

@@ -2,13 +2,12 @@
 
 TOOLBAR "" 0 20 0 2
 
-BUTTON DLG_PRINT 9 2
+BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -12 -11 "~Stampa"
+  PROMPT -12 -11 ""
-  MESSAGE EXIT,K_ENTER
 END
 
-BUTTON DLG_QUIT 9 2
+BUTTON DLG_QUIT 10 2
 BEGIN
   PROMPT -22 -11 ""
 END

ba/ba3601a.uml

@@ -70,8 +70,7 @@ END
 
 BUTTON DLG_PRINT 9 2
 BEGIN
-  PROMPT -12 -1 "~Stampa"
+  PROMPT -12 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_QUIT 9 2

ba/ba3800a.uml

@@ -10,8 +10,7 @@ END
 
 BUTTON DLG_PRINT 10 2
 BEGIN 
-  PROMPT -12 -1 "~Stampa"
+  PROMPT -12 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_QUIT 10 2

ba/ba3800b.uml

@@ -29,8 +29,7 @@ END
 
 BUTTON DLG_PRINT 10 2
 BEGIN 
-  PROMPT -12 -1 "~Stampa"
+  PROMPT -12 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_QUIT 10 2

ba/ba3a00a.uml

@@ -31,7 +31,7 @@ BEGIN
   ADD NONE
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/ba4.cpp

@@ -21,6 +21,7 @@ int main(int argc,char** argv)
     ba4100(argc,argv) ; break;
     break;
   }
+  exit(0);
 	return 0;
 }
 

ba/ba5.cpp

@@ -23,6 +23,7 @@ int main(int argc,char** argv)
   default:
     error_box(usage, argv[0]) ; break;
   }
+	exit(rt);
   return rt;
 }
 

ba/ba5100.cpp

@@ -102,23 +102,14 @@ int TQuery_socio::test(const TRectype& r) const
 // TQuery_application
 ///////////////////////////////////////////////////////////
 
-class TQuery_application : public TApplication
+class TQuery_application : public TSkeleton_application
 {
-
-  TRelation* _soci;
-  TLocalisamfile* _anag;
-  TLocalisamfile* _ditte;
   TMask* _mask;
 
-  void create_files();
-  void create_masks();
-  void destroy_masks();
-  void destroy_files();
-
 protected:
   virtual bool create();
   virtual bool destroy();
-  virtual bool menu(MENU_TAG m);
+  virtual void main_loop();
 
   bool do_query();
 
@@ -130,54 +121,26 @@ public:
 TQuery_application::TQuery_application() : _mask(NULL)
 {}
 
-void TQuery_application::create_files()
-{
-  _soci = new TRelation(LF_SOCI); _soci->lfile().setkey(3);
-  _anag = new TLocalisamfile(LF_ANAG); 
-  _ditte = new TLocalisamfile(LF_NDITTE);
-}
-
-void TQuery_application::destroy_files()
-{
-  delete _ditte;
-  delete _anag;
-  delete _soci;
-}
-
-void TQuery_application::create_masks()
-{
-  _mask = new TMask("ba5000");
-}
-
-void TQuery_application::destroy_masks()
-{
-  delete _mask;
-}
-
 bool TQuery_application::create()
 {
-  TApplication::create();
+  open_files(LF_SOCI, LF_ANAG, LF_NDITTE,0);
-
+  _mask = new TMask("ba5000");
-  create_files();
-  create_masks();
   dispatch_e_menu(MENU_ITEM(1));
-
+  return TSkeleton_application::create();
-  return TRUE;
+;
 }
 
 bool TQuery_application::destroy()
 {
-  destroy_masks();
+  delete _mask;
-  destroy_files();
 
-  return TApplication::destroy();
+  return TSkeleton_application::destroy();
 }
 
 
-bool TQuery_application::menu(MENU_TAG m)
+void TQuery_application::main_loop()
 {
   while (do_query());
-  return FALSE;
 }
 
 const char* head(const TRectype& r, const char* name,
@@ -203,14 +166,17 @@ bool TQuery_application::do_query()
 
   TQuery_socio query(_mask);
   TSoci_sheet s(query.tipo() == "F");                       // Create sheet
+	TRelation fsoci(LF_SOCI);
+	TLocalisamfile fanag(LF_ANAG);
+	TLocalisamfile fditte(LF_NDITTE);
 
-  TRectype& soci = _soci->curr();
+  TRectype& soci = fsoci.curr();
-  TRectype& anag = _anag->curr();
+  TRectype& anag = fanag.curr();
-  TRectype& ditte = _ditte->curr();
+  TRectype& ditte = fditte.curr();
 
   soci.zero();
-  _mask->autosave(*_soci);
+  _mask->autosave(fsoci);
-  for (_soci->read(_isgteq); !_soci->eof(); _soci->next())  // Fill sheet
+  for (fsoci.read(_isgteq); !fsoci.eof(); fsoci.next())  // Fill sheet
   {
     if (query.test(soci) == 0)
     {
@@ -218,8 +184,8 @@ bool TQuery_application::do_query()
       anag.zero();
       anag.put("TIPOA", query.tipo());
       anag.put("CODANAGR", cur_codice);
-      if (_anag->read() != NOERR) ragsoc = "Anagrafica assente";
+      if (fanag.read() != NOERR) ragsoc = "Anagrafica assente";
-      else ragsoc = _anag->curr().get("RAGSOC");
+      else ragsoc = anag.get("RAGSOC");
       s.add_socio(cur_codice, ragsoc);
     }
   }
@@ -250,7 +216,7 @@ bool TQuery_application::do_query()
     soci.put("CODANAGRSO", codice);
 
     TToken_string row(128);
-    for (_soci->read(_isgteq); !_soci->eof(); _soci->next())
+    for (fsoci.read(_isgteq); !fsoci.eof(); fsoci.next())
     {
       if (codice != soci.get("CODANAGRSO")) break;
       if (query.test(soci) != 0) continue;
@@ -259,7 +225,7 @@ bool TQuery_application::do_query()
       ditte.zero();
       row.add(soci.get("CODDITTA"));
       ditte.put("CODDITTA", row.get(1));
-      if (_ditte->read() != NOERR)
+      if (fditte.read() != NOERR)
         row.add("Ditta assente");
       else
         row.add(ditte.get("RAGSOC"));

ba/ba6.cpp

@@ -18,7 +18,8 @@ int main(int argc,char** argv)
   default:
     error_box(usage, argv[0]) ; break;                  
   }
-  return r < 0;
+	exit(0);
+  return 0;
 }
 
 

ba/bacnv.cpp

@@ -144,7 +144,7 @@ void TConversione_xbase::update()
 /////////////////////////////////////////////////////////////////////////////////////////
 
 
-class TConversione_archivi : public TApplication
+class TConversione_archivi : public TSkeleton_application
 {
   int _nconv;
   long _codditta;
@@ -154,7 +154,7 @@ class TConversione_archivi : public TApplication
 protected: // TApplication
   virtual bool create() ;                         
   virtual bool destroy() ;                        
-  virtual bool menu(MENU_TAG);
+  virtual void main_loop();
   
 public:
   bool convert_rmov(TLocalisamfile & rmov, TArray & recs, int nrecs);
@@ -194,8 +194,6 @@ public:
 
 bool TConversione_archivi::create()
 {
-  TApplication::create();
-
   if (argc() < 3)
   {
     _error = 101;
@@ -217,8 +215,8 @@ bool TConversione_archivi::create()
         else set_firm(_codditta);
       }
     }
-    dispatch_e_menu(MENU_ITEM(1));
+//    dispatch_e_menu(MENU_ITEM(1));
-    return TRUE;
+    return TSkeleton_application::create();
   }
 }
 
@@ -237,7 +235,7 @@ bool TConversione_archivi::destroy()
   return TRUE;
 }
 
-bool TConversione_archivi::menu(MENU_TAG)
+void TConversione_archivi::main_loop()
 {
   switch (_nconv)
   {

ba/bastage.uml

@@ -26,7 +26,7 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

ba/bastais.uml

@@ -29,7 +29,7 @@ BEGIN
   GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastivd.uml

@@ -110,8 +110,7 @@ END
 
 BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -12 -1 "~Stampa"
+  PROMPT -12 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_QUIT 10 2

ba/bastreg.uml

@@ -49,8 +49,7 @@ END
 
 BUTTON DLG_PRINT 10 2
 BEGIN 
-  PROMPT -12 -1 "~Stampa"
+  PROMPT -12 -1 ""
-  MESSAGE EXIT,K_ENTER
 END
 
 BUTTON DLG_QUIT 10 2

ba/bastucc.uml

@@ -29,7 +29,8 @@ BEGIN
   FLAGS "RZ"
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT
+ 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastucs.uml

@@ -29,7 +29,7 @@ BEGIN
   FLAGS "RZ"
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastues.uml

@@ -29,7 +29,7 @@ BEGIN
   GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastuiv.uml

@@ -27,7 +27,7 @@ BEGIN
   FIELD LF_TABCOM->CODTAB
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastuue.uml

@@ -27,7 +27,7 @@ BEGIN
   FLAGS "RZ"
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastval.uml

@@ -28,7 +28,7 @@ BEGIN
   GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END

ba/bastver.uml

@@ -59,7 +59,7 @@ BEGIN
   GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -2 ""
 END

ba/bastvet.uml

@@ -30,7 +30,7 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

ba/bastzon.uml

@@ -28,7 +28,7 @@ BEGIN
   GROUP 2
 END
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -12 -1 ""
 END