From 2cee2819d4c37f1c647799efb716a3b3c0d7cb03 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Wed, 31 Dec 2014 01:37:31 +0100
Subject: [PATCH] =?UTF-8?q?Changeset:=20581=20fdbozzo=20-=2023/12/2014=202?=
 =?UTF-8?q?3:46:48:=20-=20Bug=20fix=20dc2:=20Los=20datos=20de=20DisplayCla?=
 =?UTF-8?q?ss=20y=20DisplayClassLibrary=20ten=C3=ADan=20el=20valor=20de=20?=
 =?UTF-8?q?"Default"=20en=20vez=20del=20propio=20(Christopher=20Kurth/Ryan?=
 =?UTF-8?q?=20Harris)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TESTS/DATOS_READONLY/FB2P_DBC.DC2 |  18 +++++++++---------
 TESTS/DATOS_READONLY/fb2p_dbc.dbc | Bin 8968 -> 8968 bytes
 TESTS/DATOS_READONLY/fb2p_dbc.dct | Bin 138240 -> 147328 bytes
 foxbin2prg.prg                    |   6 ++++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/TESTS/DATOS_READONLY/FB2P_DBC.DC2 b/TESTS/DATOS_READONLY/FB2P_DBC.DC2
index 4957365..06eda8c 100644
--- a/TESTS/DATOS_READONLY/FB2P_DBC.DC2
+++ b/TESTS/DATOS_READONLY/FB2P_DBC.DC2
@@ -609,17 +609,17 @@
 			<FIELDS>
 				<FIELD>
 					<Name>dummy</Name>
-					<Caption></Caption>
-					<Comment></Comment>
+					<Caption>Dummy</Caption>
+					<Comment>Dummy_field_comment</Comment>
 					<DataType>C(1)</DataType>
-					<DefaultValue></DefaultValue>
-					<DisplayClass></DisplayClass>
-					<DisplayClassLibrary></DisplayClassLibrary>
-					<Format></Format>
-					<InputMask></InputMask>
+					<DefaultValue>Depto.</DefaultValue>
+					<DisplayClass>cl_optiongroup</DisplayClass>
+					<DisplayClassLibrary>fb2p_test.vcx</DisplayClassLibrary>
+					<Format>!</Format>
+					<InputMask>XXXXXXXXXX</InputMask>
 					<KeyField>.F.</KeyField>
-					<RuleExpression></RuleExpression>
-					<RuleText></RuleText>
+					<RuleExpression>dummy_field_validation_rule()</RuleExpression>
+					<RuleText>dummy_field_validation_message</RuleText>
 					<Updatable>.T.</Updatable>
 					<UpdateName>DUAL.DUMMY</UpdateName>
 				</FIELD>
diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dbc b/TESTS/DATOS_READONLY/fb2p_dbc.dbc
index e663ef900069390afe5579c6b750060653857050..39fe57a02a013aa2ca1f01903a9c2fcf50105719 100644
GIT binary patch
delta 43
zcmV+`0M!48Mu<iPFb)hKu>|%G0__O1{0^840{RG(mKvi1(g>3~8>0gC2(#cDC<jIL
B4@dw2

delta 43
zcmV+`0M!48Mu<iPFb)C&u>|%G0>1&X{0^840?z=GmKvi1wE>em8>0fp0JGp5C<ikV
B4qpHO

diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dct b/TESTS/DATOS_READONLY/fb2p_dbc.dct
index 2efee30272540014f650ebcd9e6e993c0ec3846e..b5f6cf72def8db2e42039a8d4f86acd6fb73d592 100644
GIT binary patch
delta 1449
zcmZqJ!O`%agM)#A;~xV9gTqF_PmB{4IGdT7+L@Ucw=**_{gnhtGB5%W^X3!A%#0HS
zEm(m(h98qp82^AuF?;}WF6+vI6*B7S#Q;%Rd3=6RVth(zVvb%)QW{VS4nW#3gLF(3
z)Bu^q=)L)bp*PTE12E44$a7$vC}a)hSpa!rjFX=kDZ$(!1{Rqps0x<9xcNl>MaGGu
zT43HWAnzDZuPK<f56GLzI61RWb)t|hSY#$d<e{G0<aS-b$q~77?4m%|FftfVcVuC5
znyA16QpOND*&|m^1S*r3WK<Ael3HA%SC(8c-H??@e4>yNSXnxLWxRY~qq$vD3rh0!
zCJKszHI?Akq>iGAffsCqg-dB}ZY7Wj1|S!9;Wxzqk11k6?TifU@oAZ<IVthU`MJ5N
zc_otrnamjb@f&K2$53gAp<s8SnmkcZ7wqpD_zkxs%Wwuxu)XGr69rYkwyeT$O8{lI
zFbILIGmC(O$%U+9jOX!N8bNJK8C1c};GBF>Q=F}+G$&O<6Bf!}2hb^!5T`JxfnCRy
z0!p)xv@rSOX<;6qC<uU3F9BD^(kj5fPMW+?Q&Nba8yOb@i;9K7LP-jgt{6c@$wEdM
z)FLjkxFj(?CqEfd#7z{m11miVR?35{baHK>G$ZTeiNHK|1*hz36C<#GIbiuF2eeog
NoS<(53(DI-4gfdVO#A=<

delta 35
rcmZqp&(W}hgM)#Aqkw^d!C|A|C&q~ioXyNk?aWM!+nJe|{z?J>tQH91

diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index 84b8e35..551c919 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -124,6 +124,7 @@
 * 18/12/2014	FDBOZZO		v1.19.39	Mejora: Agregar la clave SHOWMSG y dejar INTERACTIVE para un diálogo interactivo (Mike Potjer)
 * 18/12/2014	FDBOZZO		v1.19.39	Mejora: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar (Mike Potjer)
 * 18/12/2014	FDBOZZO		v1.19.39	Bug fix vbs: Los scripts vbs no muestren los errores del proceso de FoxBin2Prg
+* 30/12/2014	FDBOZZO		v1.19.39	Bug fix dc2: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio (Ryan Harris)
 * 
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
@@ -181,6 +182,7 @@
 * 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se usan las claves BIN2PRG o PRG2BIN permitir procesar un archivo solo
 * 16/12/2014	Mike Potjer			Mejora v1.19.38: Agregar la clave SHOWMSG y dejar INTERACTIVE para un diálogo interactivo
 * 16/12/2014	Mike Potjer			Mejora v1.19.38: Cuando se procesa un directorio con foxbin2prg.exe solo y la clave INTERACTIVE, mostrar un diálogo para preguntar qué procesar
+* 30/12/2014	Ryan Harris			Bug Fix v1.19.38: Los datos de DisplayClass y DisplayClassLibrary tenían el valor de "Default" en vez del propio
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
 *---------------------------------------------------------------------------------------------------
@@ -17609,8 +17611,8 @@ DEFINE CLASS CL_DBC_FIELD_VW AS CL_DBC_BASE
 				<<>>					<Comment><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","Comment")>></Comment>
 				<<>>					<DataType><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DataType")>></DataType>
 				<<>>					<DefaultValue><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DefaultValue")>></DefaultValue>
-				<<>>					<DisplayClass><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DefaultValue")>></DisplayClass>
-				<<>>					<DisplayClassLibrary><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DefaultValue")>></DisplayClassLibrary>
+				<<>>					<DisplayClass><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DisplayClass")>></DisplayClass>
+				<<>>					<DisplayClassLibrary><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","DisplayClassLibrary")>></DisplayClassLibrary>
 				<<>>					<Format><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","Format")>></Format>
 				<<>>					<InputMask><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","InputMask")>></InputMask>
 				<<>>					<KeyField><<DBGETPROP( RTRIM(tcView) + '.' + RTRIM(tcField),"FIELD","KeyField")>></KeyField>