From 281fc6a16bfe2d959dce0537a24a45cb01c2db58 Mon Sep 17 00:00:00 2001
From: fdbozzo <>
Date: Sat, 3 Mar 2018 21:41:01 +0100
Subject: [PATCH] =?UTF-8?q?Correcci=C3=B3n=20para=20PRG=5FCompat=5FLevel:1?=
 =?UTF-8?q?=20(HELPSTRING)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 foxbin2prg.cfg.txt |  1 +
 foxbin2prg.prg     | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt
index aead4cf..0549b5f 100644
--- a/foxbin2prg.cfg.txt
+++ b/foxbin2prg.cfg.txt
@@ -26,6 +26,7 @@
 * RemoveZOrderSetFromProps: 0	&& 0=Do not remove ZOrderSet property from object, 1=Remove ZOrderSet property from object / 0=No quitar la propiedad ZOrderSet de los objetos, 1=Quitar la propiedad ZOrderSet de los objetos
 * Language: (auto)				&& Language of shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC [DEFAULT]
 * ExcludeDBFAutoincNextval: 0	&& [0=Do not exclude this value from db2], 1=Exclude this value from db2
+* PRG_Compat_Level: 0			&& [0=Legacy (up to v1.19.49)], 1=Use HELPSTRING as Procedure comment
 
 *-- CONVERTION OPTIONS / OPCIONES DE CONVERSIÓN
 * PJX_Conversion_Support: 2		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index a0e46df..c9c7234 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -825,7 +825,7 @@ DEFINE CLASS c_foxbin2prg AS Session
 	l_RemoveZOrderSetFromProps		= .F.
 	l_Recompile						= .T.
 	n_UseClassPerFile				= 0
-	n_PRG_Compat_Level				= 1				&& 0=COMPATIBLE WITH FoxBin2Prg v1.19.49 and earlier, 1=Include HELPSTRING
+	n_PRG_Compat_Level				= 0				&& 0=COMPATIBLE WITH FoxBin2Prg v1.19.49 and earlier, 1=Include HELPSTRING
 	n_ExcludeDBFAutoincNextval		= 0
 	l_ClassPerFileCheck				= .F.
 	l_RedirectClassPerFileToMain	= .F.
@@ -2299,10 +2299,8 @@ DEFINE CLASS c_foxbin2prg AS Session
 
 						CASE LEFT( laConfig(I), 17 ) == LOWER('PRG_Compat_Level:')
 							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 18 ) )
-							IF INLIST( lcValue, '0', '1' ) THEN
-								lo_CFG.n_PRG_Compat_Level	= INT( VAL( lcValue ) )
-								.writeLog( C_TAB + JUSTFNAME(lcConfigFile) + ' > PRG_Compat_Level:           ' + TRANSFORM(lo_CFG.n_PRG_Compat_Level) )
-							ENDIF
+							lo_CFG.n_PRG_Compat_Level	= INT( VAL( lcValue ) )
+							.writeLog( C_TAB + JUSTFNAME(lcConfigFile) + ' > PRG_Compat_Level:           ' + TRANSFORM(lo_CFG.n_PRG_Compat_Level) )
 
 						ENDCASE
 					ENDFOR
@@ -13682,7 +13680,13 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 
 						*-- Comentarios del método (si tiene)
 						IF lnCommentRow > 0 AND NOT EMPTY(taPropsAndComments(lnCommentRow,2))
-							lcMethod	= lcMethod + C_TAB + C_TAB + '&' + '& ' + taPropsAndComments(lnCommentRow,2)
+							* PRG_Compat_Level >= 1
+                            IF BITAND(toFoxBin2Prg.n_PRG_Compat_Level, 1) > 0
+								lcMethod	= lcMethod + C_TAB + C_TAB + 'HELPSTRING "' + taPropsAndComments(lnCommentRow,2) + '"'
+                            ELSE
+                            	* PRG_Compat_Level = 0 (Default old setting)
+								lcMethod	= lcMethod + C_TAB + C_TAB + '&' + '& ' + taPropsAndComments(lnCommentRow,2)
+							ENDIF
 						ENDIF
 
 						*-- Código del método
@@ -27807,7 +27811,7 @@ DEFINE CLASS CL_CFG AS CUSTOM
 		+ [<memberdata name="dbf_conversion_excluded" display="DBF_Conversion_Excluded"/>] ;
 		+ [<memberdata name="dbc_conversion_support" display="DBC_Conversion_Support"/>] ;
 		+ [<memberdata name="c_backgroundimage" display="c_BackgroundImage"/>] ;
-		+ [<memberdata name="prg_compat_level" display="PRG_Compat_Level"/>] ;
+		+ [<memberdata name="n_prg_compat_level" display="n_PRG_Compat_Level"/>] ;
 		+ [<memberdata name="copyfrom" display="CopyFrom"/>] ;
 		+ [</VFPData>]