diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index 30a3909..1b87742 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -26,7 +26,7 @@ _LegalTrademark = "Open Source" _ProductName = " FOXBIN2PRG" _MajorVer = "1" _MinorVer = "19" -_Revision = " 270" +_Revision = " 277" _LanguageID = "1034" _AutoIncrement = "1" * diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index b68d64f..3055185 100644 Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 94fefc1..d90ca09 100644 Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ diff --git a/foxbin2prg.prg b/foxbin2prg.prg index ffc6e1f..fad7303 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -7863,6 +7863,8 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base <<>> <> ENDTEXT + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF ENDPROC @@ -7965,7 +7967,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8 <> ENDTEXT - + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDPROC @@ -7981,10 +7985,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base IF '.' $ toRegObj.PARENT *-- Este caso: clase.objeto.objeto ==> se quita clase - lcNombre = SUBSTR(toRegObj.Parent, AT('.', toRegObj.Parent)+1) + '.' + toRegObj.objName + lcNombre = SUBSTR(toRegObj.PARENT, AT('.', toRegObj.PARENT)+1) + '.' + toRegObj.OBJNAME ELSE *-- Este caso: objeto - lcNombre = toRegObj.objName + lcNombre = toRegObj.OBJNAME ENDIF TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8 @@ -7997,7 +8001,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8 <> ENDTEXT - + ENDPROC @@ -8595,9 +8599,15 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg GOTO RECORD (lnRecno) ASORT(laObjs, 2, -1, 0, 0) && Orden por ZOrder - FOR I = 1 TO lnObjCount - .write_OBJECTMETADATA( laObjs(I,1) ) - ENDFOR + IF lnObjCount > 0 + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ' *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder ' + + FOR I = 1 TO lnObjCount + .write_OBJECTMETADATA( laObjs(I,1) ) + ENDFOR + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF .write_INCLUDE( @loRegClass ) @@ -8806,9 +8816,15 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg GOTO RECORD (lnRecno) ASORT(laObjs, 2, -1, 0, 0) && Orden por ZOrder - FOR I = 1 TO lnObjCount - .write_OBJECTMETADATA( laObjs(I,1) ) - ENDFOR + IF lnObjCount > 0 + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ' *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder ' + + FOR I = 1 TO lnObjCount + .write_OBJECTMETADATA( laObjs(I,1) ) + ENDFOR + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF .write_INCLUDE( @loRegClass )