Aggiornato uso di TRelation::lfile

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

include/applicat.cpp

@@ -90,7 +90,7 @@ public:
 
 TBanner::TBanner()
 {
-  create(-1, 2, 68, 7, "BANNER", WSF_NONE, W_PLAIN);
+  create(-1, 2, 72, 6, "BANNER", WSF_NONE, W_PLAIN);
   hide_brush();
   open_modal();
   do_events();
@@ -113,7 +113,7 @@ void TBanner::handler(WINDOW win, EVENT* ep)
     char* t = (char*)(const char*)main_app().title();
     int w = win_get_text_width(win, t, -1);
     int x = (r.right-r.left-w)>>1, y = r.bottom - 4*CHARY;
-    win_draw_text(win, x+2, y+2, t, -1);
+    win_draw_text(win, x+1, y+1, t, -1);
     set_color(COLOR_BLACK, COLOR_LTGRAY);
     win_draw_text(win, x, y, t, -1);
 
@@ -233,16 +233,16 @@ long TApplication::handler(WINDOW, EVENT* ep)
   case E_CREATE:
   {
     bool ok = FALSE;
-    {
+  {
-      TBanner banner;
+    TBanner banner;
-      ok = create();
+    ok = create();
-    }
+  }
     if (!ok)  
       stop_run();
   }  
   break;
-  case E_COMMAND:
+ case E_COMMAND:
-  {
+{
   const MENU_TAG mt = ep->v.cmd.tag;
   switch(mt)
   {
@@ -273,25 +273,25 @@ long TApplication::handler(WINDOW, EVENT* ep)
     }   
     break;
   }
-  }
+}
+break;
+ case E_CLOSE:
+ if (can_close())
+  stop_run();
   break;
-  case E_CLOSE:
+ case E_QUIT:
+ if (ep->v.query) 
+{
   if (can_close())
-    stop_run();
+    quit_OK();
-  break;
+} 
-  case E_QUIT:
+else 
-  if (ep->v.query) 
+stop_run();
-  {
+break;
-    if (can_close())
+default:
-      quit_OK();
+break;
-  } 
+}
-  else 
+return 0L;
-    stop_run();
-  break;
-  default:
-  break;
-  }
-  return 0L;
 }
 
 

include/maskfld.cpp

@@ -1,4 +1,4 @@
-//      $Id: maskfld.cpp,v 1.21 1994-09-21 11:16:20 guy Exp $
+//      $Id: maskfld.cpp,v 1.22 1994-09-22 07:47:53 guy Exp $
 #include <xvt.h>
 
 #include <applicat.h>
@@ -1486,14 +1486,14 @@ void TEdit_field::enable(bool on)
 {
   TMask_field::enable(on);
   if (_buttonwin != NULL_WIN)
-    show_window(_buttonwin, on && _check_enabled && showed());
+    show_window(_buttonwin, on && check_enabled() && showed());
 }
 
 void TEdit_field::show(bool on)
 {
   TMask_field::show(on);
   if (_buttonwin != NULL_WIN)
-    show_window(_buttonwin, on && _check_enabled && enabled());
+    show_window(_buttonwin, on && check_enabled() && enabled());
 }
 
 
@@ -1865,12 +1865,17 @@ bool TEdit_field::on_key(KEY key)
       if (_sheet) ok = query || _sheet->check();  // Check consistency
       else
         if (check_enabled() && _browse && (!query || forced()))
-          ok = _browse->check();  // Check consistency
+          ok = _browse->check();
       
       if (!ok)
       {
         if (_warning.not_empty()) error_box(_warning);
-        else error_box("Valore del campo %d non valido: %s", dlg(), (const char*)get());
+        else 
+#ifdef DBG
+          error_box("Valore del campo %d non valido: %s", dlg(), (const char*)get());
+#else
+        error_box("Valore non valido: %s", (const char*)get());
+#endif        
         return FALSE;
       }
       

include/prassi.ver

@@ -1 +1 @@
-#define VERSION 1.4
+#define VERSION 1.5

include/printapp.cpp

@@ -1,4 +1,4 @@
-//      $Id: printapp.cpp,v 1.11 1994-09-21 11:16:25 guy Exp $      
+//      $Id: printapp.cpp,v 1.12 1994-09-22 07:47:59 guy Exp $      
 #include <ctype.h>
 #include <stdarg.h>
 

include/relapp.cpp

@@ -1,4 +1,4 @@
-//      $Id: relapp.cpp,v 1.10 1994-09-21 11:16:28 guy Exp $        
+//      $Id: relapp.cpp,v 1.11 1994-09-22 07:48:03 guy Exp $        
 #include <mailbox.h>
 #include <sheet.h>
 #include <urldefid.h>

include/relation.cpp

@@ -1,4 +1,4 @@
-//      $Id: relation.cpp,v 1.9 1994-09-21 11:16:30 guy Exp $
+//      $Id: relation.cpp,v 1.10 1994-09-22 07:48:05 guy Exp $
 // relation.cpp
 // fv 12/8/93
 // relation class for isam files

include/relation.h

@@ -1,4 +1,4 @@
-/*      $Id: relation.h,v 1.4 1994-09-21 11:16:32 guy Exp $      */
+/*      $Id: relation.h,v 1.5 1994-09-22 07:48:07 guy Exp $      */
 // join.h
 // fv 12/8/93
 // join class for isam files