Patch level : 2.1

Files correlati     : ci.exe
Ricompilazione Demo : [ ]
Commento            :
Ritocchi minimi ma utili per modulo ci


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

include/applicat.h

@@ -5,10 +5,6 @@
 #include <xvt.h>
 #endif
 
-#ifndef __STRINGS_H
-#include <strings.h>
-#endif
-
 #ifndef __DICTION_H
 #include <diction.h>
 #endif

include/mask.cpp

@@ -2244,7 +2244,7 @@ bool TMask::kill_profile(int num)
   if (num <= 0)
     num = ini.get_int(user());
  
-  TString16 name; name << num;
+  TString8 name; name << num;
   const bool ok = ini.set_paragraph(name);
   if (ok)
     ini.remove_all();
@@ -2263,13 +2263,8 @@ void TMask::set_caption(const char* c)
 {
   TToken_string captions(c);
 
-  // Kill page tags
-	byte p;
-	for ( p = 1; p <_pages; p++)
-		if (!page_enabled(p))
-			break;
-	while (captions.items() < p)
-		captions.add(captions.get(0));
+  bool bTags = false;
+  // Kill any page tags
   for (int i = fields()-1; i > 0; i--)
   {
     TMask_field& tag = fld(i);
@@ -2277,12 +2272,34 @@ void TMask::set_caption(const char* c)
 		{
       tag.destroy();
       _field.destroy(i);
+      bTags = true;
 		}
     else
       break;
   }
-  // Create page tags
-  add_tag_buttons(captions);
+    
+  if (bTags)
+  {
+	  byte p;
+	  for (p = 1; p <_pages; p++)
+		  if (!page_enabled(p))
+			  break;
+	  while (captions.items() < p)
+    {
+      const char* k = captions.get(0);
+		  captions.add(k);
+    }
+    add_tag_buttons(captions); // Create page tags
+  }
+  else
+  {
+	  for (byte p = 0; p < _pages; p++)
+    {
+      const char* k = captions.get(p);
+      if (k == NULL) k = captions.get(0);
+		  xvt_vobj_set_title(_pagewin[p], k);   
+    }
+  }
 }
 
 void TMask::post_error_message(const char* msg, int sev)

include/prefix.cpp

@@ -856,6 +856,12 @@ const TString& TFirm::codice_valuta() const
   return codval;
 }
 
+const TString& TFirm::ragione_sociale() const
+{          
+  return get(NDT_RAGSOC);
+}
+
+
 TFirm::TFirm(long code)
 {
   read(code);
@@ -1019,7 +1025,7 @@ void TPrefix::unlock_record(TIsam_handle num, TRecnotype rec)
 
 bool TPrefix::test(long codditta) const
 {
-  TString16 s("com");
+  TString8 s("com");
   if (codditta > 0L)
     s.format("%05lda", codditta);
   return test(s);
@@ -1036,7 +1042,7 @@ bool TPrefix::set_codditta(long codditta, bool force)
 {
   if (force || test(codditta))
   {
-    TString16 s("com");
+    TString8 s("com");
     if (codditta > 0L) 
       s.format("%05lda", codditta); 
     set(s, force);

include/prefix.h

@@ -79,6 +79,7 @@ public:
   
   long codice() const;
   const TString& codice_valuta() const;
+  const TString& ragione_sociale() const;
   
   virtual bool ok() const { return codice() > 0L; }
 

include/relation.h

@@ -440,7 +440,7 @@ public:
   { _if->restore_status(); }
 
   // @cmember Restituisce se il è sorted (default = FALSE)
-  virtual bool is_sorted() const { return FALSE; }
+  virtual bool is_sorted() const { return false; }
 
   bool scan(CURSOR_SCAN_FUNC func, void* pJolly = NULL, const char* msg = "");
 
@@ -504,7 +504,7 @@ public:
   const char* get_order() const { return _order_expr; }
   
   // @cmember Restituisce se il è sorted (default = FALSE)
-  virtual bool is_sorted() const { return TRUE; }
+  virtual bool is_sorted() const { return true; }
 
   virtual bool update_relation() const { return _sort_update || TCursor::update_relation();}
 

include/strings.h

@@ -98,6 +98,8 @@ public:
   { return *_str != '\0'; }
   // @cmember Controlla se la stringa e' vuota o contiene solo whitespace (true se vuota)
   bool blank() const;
+  // @cmember Controlla se la stringa NON e' vuota o contiene solo whitespace (true se vuota)
+  bool full() const { return !blank(); }
 
   // @cmember Ritorna la posizione della prima occorrenza carattere char nell'oggetto TString
   int find(char, int from = 0) const;