From f49dd37cf1f6ace8a671cccd9f6a24ac1401d86f Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 18 Nov 2010 11:53:17 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            : Mostra esempio corretto per
 campi VALUTA in editor dei form

git-svn-id: svn://10.65.10.50/branches/R_10_00@21150 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/form.cpp   | 11 ++++-------
 include/formed.cpp | 16 +++++++++-------
 include/isam.cpp   |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/form.cpp b/include/form.cpp
index f25559a16..4cb8e7c9b 100755
--- a/include/form.cpp
+++ b/include/form.cpp
@@ -1419,6 +1419,8 @@ protected: // TForm_string
   virtual const char* get() const;
   // @cmember Manda il messaggio al campo <p dest>
   virtual void send_message(const TString& cmd, TForm_item& dest) const;
+  const char* example() const { return "12.345.678,90";  }
+
 public:  
   virtual TObject* dup() const;
   virtual TCurrency get_currency() const;
@@ -4459,19 +4461,14 @@ bool TForm::write_profile()
         sec->print_on(cur);
         sec->set_dirty(FALSE);
 
-        err = _isnew ? rform.write() : rform.rewrite();
-        if (err != NOERR)
-          err = _isnew ? rform.rewrite() : rform.write();
-
+        err = _isnew ? rform.write_rewrite() : rform.rewrite_write();
         for (word i = 0; i < sec->fields() && err == NOERR; i++)
         {
           TForm_item& fi = sec->field(i);
           if (fi.dirty())
           {
             fi.print_on(cur);
-            err = _isnew ? rform.write() : rform.rewrite();
-            if (err != NOERR)
-              err = _isnew ? rform.rewrite() : rform.write();
+            err = _isnew ? rform.write_rewrite() : rform.rewrite_write();
             fi.set_dirty(FALSE);
           }
         }
diff --git a/include/formed.cpp b/include/formed.cpp
index 5d2ddbfff..35225bf82 100755
--- a/include/formed.cpp
+++ b/include/formed.cpp
@@ -723,7 +723,7 @@ bool TPrint_section::repos_fields(const char* name, int size)
     ps.form().fontname() = name;
     ps.form().fontsize() = size;
     // Aggiorna lo spreadsheet
-    TSheet_field& ms = (TSheet_field&)ps._msk->field(F_FIELDS);
+    TSheet_field& ms = ps._msk->sfield(F_FIELDS);
     TToken_string tt(128);
     const word flds = ps.fields();
     for (word i = 0; i < flds; i++)
@@ -1005,7 +1005,7 @@ bool TPrint_section::detail_field_notify (TSheet_field& s, int r, KEY k)
   else
   if (k == K_SPACE)
   {
-    if (_cur_form && TString(_cur_form->section_mask()).left(2) == "ba")
+    if (_cur_form && TFixed_string(_cur_form->section_mask()).starts_with("ba"))
     {
       TString80 name(s.mask().get(F_FONT));
       int       size = s.mask().get_int(F_SIZE);
@@ -1025,7 +1025,7 @@ bool TPrint_section::detail_field_notify (TSheet_field& s, int r, KEY k)
 bool TPrint_section::edit(
      const char* title)  // @parm Titolo della maschera di edit
 {
-  const bool is_ba_editor = TString(_form->section_mask()).left(2) == "ba";
+  const bool is_ba_editor = TFixed_string(_form->section_mask()).starts_with("ba");
   bool nstd_dirty = FALSE;
   bool  font_found = FALSE;
 
@@ -1053,7 +1053,7 @@ bool TPrint_section::edit(
     }
     else
        _form->pre_edit_checks(m,_cur_sect);
-    TSheet_field& ms = (TSheet_field&)m.field(F_FIELDS);
+    TSheet_field& ms = m.sfield(F_FIELDS);
 
     m.hide(F_OFSVR);//Offset verticale, per _columnwise. Non ancora usato.
     if (_columnwise)
@@ -1130,7 +1130,7 @@ bool TPrint_section::edit(
       bool ok = FALSE;
       while (m.run() != K_ESC)
       {
-        TSheet_field& ms = (TSheet_field&)m.field(F_FIELDS);
+        TSheet_field& ms = m.sfield(F_FIELDS);
         const int items = ms.items();
         int i;
         
@@ -1139,8 +1139,10 @@ bool TPrint_section::edit(
           TToken_string& tt = ms.row(i);
           ok = tt.get_char(prn_id - 101)==' ';
         }
-        if (i==items && !ok) error_box("Selezionare almeno una colonna stampabile.");
-        if (ok) break;
+        if (i==items && !ok) 
+          error_box("Selezionare almeno una colonna stampabile.");
+        if (ok) 
+          break;
       }
       _msk = NULL;
       if (!ok) return FALSE;
diff --git a/include/isam.cpp b/include/isam.cpp
index ed2a2a7dd..1e6047343 100755
--- a/include/isam.cpp
+++ b/include/isam.cpp
@@ -2242,7 +2242,7 @@ int TSystemisamfile::packfile(
 int TSystemisamfile::zap()
 {
   safely_close_closeable_isamfiles();
-  return packfile(TRUE, TRUE);
+  return packfile(true, true);
 }
 
 // @doc EXTERNAL