Patch level : 12.0 nopatch

Files correlati     :
Commento:
corrette l funzioni ini_get_long per come erano definita una non era usata
Cambiato il tasto di salvataggio valori maschera in ALT+W

src/include/automask.cpp

@@ -355,7 +355,6 @@ void TVariable_automask::set_handlers()
   }  
 }
 
-
 TVariable_automask::TVariable_automask(const char* name, int num)
                   : TVariable_mask(name, num)
 {

src/include/automask.h

@@ -1,7 +1,7 @@
 #ifndef __AUTOMASK_H
 #define __AUTOMASK_H
 
-#ifndef __DEFMASK_Hautomask
+#ifndef __DEFMASK_H
 #include <defmask.h>
 #endif
 
@@ -33,7 +33,7 @@ protected:
   TField_event key2event(TMask_field& f, KEY key) const;
 
 public:
-	void set_handlers();
+	virtual void set_handlers();
   virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly) pure;
   bool error_box(const char* fmt, ...);   // No more f.error_box
 	void set_universal_handler(const short id) { set_handler(id, universal_handler);}

src/include/config.cpp

@@ -1023,7 +1023,7 @@ int ini_get_int(const char* file, const char* para, const char* name, int defval
   return xvt_sys_get_profile_int(file, para, varname, defval);
 }
 
-int ini_get_long(const char* file, const char* para, const char* name, long defval, int idx)
+long ini_get_long(const char* file, const char* para, const char* name, long defval, int idx)
 {
   DECLARE_VARNAME(name, idx);
   return xvt_sys_get_profile_int(file, para, varname, defval);
@@ -1094,7 +1094,7 @@ int ini_get_int(int cfg, const char* paragraph, const char* name, int defval, in
   return ini_get_int(filename, paragraph, name, defval, idx);
 }
 
-int ini_get_long(int cfg, const char* paragraph, const char* name, int defval, int idx)
+long ini_get_long(int cfg, const char* paragraph, const char* name, long defval, int idx)
 {
   DECLARE_FILENAME(cfg);
   return ini_get_long(filename, paragraph, name, defval, idx);

src/include/config.h

@@ -190,7 +190,7 @@ public:
 // Low level utilities
 bool           ini_get_bool  (const char* file, const char* para, const char* name, bool defval = false, int idx = -1);
 int            ini_get_int(const char* file, const char* para, const char* name, int defval = 0, int idx = -1);
-int            ini_get_long(const char* file, const char* para, const char* name, long defval = 0, int idx = -1);
+long           ini_get_long(const char* file, const char* para, const char* name, long defval = 0, int idx = -1);
 const TString& ini_get_string(const char* file, const char* para, const char* name, const char* defval = "", int idx = -1);
 const TDate    ini_get_date  (const char* file, const char* para, const char* name, const char* defval = "", int idx = -1);
 const real     ini_get_real(const char* file, const char* para, const char* name, const char* defval = "", int idx = -1);
@@ -207,7 +207,7 @@ void					 ini_del_memo  (const char* file, const char* para, const char* name);
 // High level utilities
 bool           ini_get_bool  (int cfg, const char* para, const char* name, bool defval = false, int idx = -1);
 int            ini_get_int(int cfg, const char* para, const char* name, int defval = 0, int idx = -1);
-int            ini_get_long(int cfg, const char* para, const char* name, long defval = 0, int idx = -1);
+long           ini_get_long(int cfg, const char* para, const char* name, long defval = 0, int idx = -1);
 const TString& ini_get_string(int cfg, const char* para, const char* name, const char* defval = "", int idx = -1);
 const TDate    ini_get_date  (int cfg, const char* para, const char* name, const char* defval = "", int idx = -1);
 const real     ini_get_real (int cfg, const char* para, const char* name, const char* defval = "", int idx = -1);

src/include/controls.cpp

@@ -1799,8 +1799,8 @@ TPushbutton_control::TPushbutton_control(WINDOW win, short cid,
                    : _bmp_up(bmp_up), _bmp_dn(bmp_dn)
 {
   const bool drawable = bmp_up > 0;
-  create(win, cid, left, top, width, height, flags, text, WC_PUSHBUTTON, NULL, drawable);
 
+  create(win, cid, left, top, width, height, flags, text, WC_PUSHBUTTON, NULL, drawable);
   if (bmp_up > 10000 && height >= 2)
     set_icon(bmp_up, bmp_dn);
   else

src/include/mask.cpp

@@ -788,12 +788,14 @@ bool TMask::stop_run(
         if (f.is_kind_of(CLASS_BUTTON_FIELD))
         {
           const TButton_field& b = (const TButton_field&)f;
+
           if (b.exit_key() == key)
             break;
         } else
         if (f.is_kind_of(CLASS_BUTTON_TOOL))
         {
           const TButton_tool& b = (const TButton_tool&)f;
+
           if (b.exit_key() == key || b.virtual_key() == key)
             break;
         } 
@@ -814,6 +816,7 @@ bool TMask::stop_run(
   if (key != K_ESC && key != K_QUIT && key != K_DEL && key != K_F9)
   {
     bool ok = check_current_field();
+
     if (ok)
       ok = check_fields();
     if (ok) 
@@ -1125,7 +1128,7 @@ bool TMask::on_key(
 					show_page(page);
 			}
 			else
-				if (UPCASE(key) == 'S')
+				if (UPCASE(key) == 'W')
 				{
 					TFilename fname;