[Ede-cvs] efltk/bcb6 arc.bpr,1.6,1.7 ask.bpr,1.6,1.7 bitmap.bpr,1.6,1.7 boxtype.bpr,1.6,1.7 browser.bpr,1.6,1.7 button.bpr,1.6,1.7 buttons.bpr,1.6,1.7 calendar.bpr,1.6,1.7 checkers.bpr,1.6,1.7 clock.bpr,1.6,1.7 db_odbc.bpr,1.1,1.2 libefltk.bpr,1.12,1.13 line_style.bpr,1.1,1.2 listview.bpr,1.1,1.2 listview_ds.bpr,1.1,1.2 tabs.bpr,1.1,1.2 tabs1.bpr,1.1,1.2 tabs2.bpr,1.1,1.2

[<laz...@us...>]

Update of /cvsroot/ede/efltk/bcb6
In directory sc8-pr-cvs1:/tmp/cvs-serv2918

Modified Files:
	arc.bpr ask.bpr bitmap.bpr boxtype.bpr browser.bpr button.bpr 
	buttons.bpr calendar.bpr checkers.bpr clock.bpr db_odbc.bpr 
	libefltk.bpr line_style.bpr listview.bpr listview_ds.bpr 
	tabs.bpr tabs1.bpr tabs2.bpr 
Log Message:
Updated BCB project files, these don't have static paths

Index: arc.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/arc.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- arc.bpr	24 Apr 2003 16:52:36 -0000	1.6
+++ arc.bpr	24 Apr 2003 21:17:48 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="..\arc.exe"/>
+    <PROJECT value="..\bcb6\arc.exe"/>
     <OBJFILES value="obj\arc.obj"/>
     <RESFILES value="arc.res"/>
     <IDLFILES value=""/>
@@ -27,17 +27,17 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="arc.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
     <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
@@ -89,29 +89,35 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
 Count=3
@@ -120,11 +126,12 @@
 Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=4
-Item0=..\
-Item1=..
-Item2=\efltk\
-Item3=R:\efltk\
+Count=5
+Item0=..\bcb6\
+Item1=..\
+Item2=..
+Item3=\efltk\
+Item4=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: ask.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/ask.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ask.bpr	24 Apr 2003 16:52:37 -0000	1.6
+++ ask.bpr	24 Apr 2003 21:17:49 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\ask.exe"/>
+    <PROJECT value="..\bcb6\ask.exe"/>
     <OBJFILES value="obj\ask.obj"/>
     <RESFILES value="ask.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="ask.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: bitmap.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/bitmap.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bitmap.bpr	24 Apr 2003 16:52:41 -0000	1.6
+++ bitmap.bpr	24 Apr 2003 21:17:50 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\bitmap.exe"/>
+    <PROJECT value="..\bcb6\bitmap.exe"/>
     <OBJFILES value="obj\bitmap.obj"/>
     <RESFILES value="bitmap.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="bitmap.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: boxtype.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/boxtype.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- boxtype.bpr	24 Apr 2003 16:52:41 -0000	1.6
+++ boxtype.bpr	24 Apr 2003 21:17:50 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\boxtype.exe"/>
+    <PROJECT value="..\bcb6\boxtype.exe"/>
     <OBJFILES value="obj\boxtype.obj"/>
     <RESFILES value="boxtype.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="boxtype.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: browser.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/browser.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- browser.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ browser.bpr	24 Apr 2003 21:17:51 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\browser.exe"/>
+    <PROJECT value="..\bcb6\browser.exe"/>
     <OBJFILES value="obj\browser.obj"/>
     <RESFILES value="browser.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="browser.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: button.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/button.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- button.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ button.bpr	24 Apr 2003 21:17:51 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\button.exe"/>
+    <PROJECT value="..\bcb6\button.exe"/>
     <OBJFILES value="obj\button.obj"/>
     <RESFILES value="button.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="button.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: buttons.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/buttons.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- buttons.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ buttons.bpr	24 Apr 2003 21:17:52 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\buttons.exe"/>
+    <PROJECT value="..\bcb6\buttons.exe"/>
     <OBJFILES value="obj\buttons.obj"/>
     <RESFILES value="buttons.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="buttons.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: calendar.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/calendar.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- calendar.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ calendar.bpr	24 Apr 2003 21:17:53 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\calendar.exe"/>
+    <PROJECT value="..\bcb6\calendar.exe"/>
     <OBJFILES value="obj\calendar.obj"/>
     <RESFILES value="calendar.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="calendar.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: checkers.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/checkers.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- checkers.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ checkers.bpr	24 Apr 2003 21:17:53 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\checkers.exe"/>
+    <PROJECT value="..\bcb6\checkers.exe"/>
     <OBJFILES value="obj\checkers.obj"/>
     <RESFILES value="checkers.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="checkers.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\\obj -N0..\bcb6\\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: clock.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/clock.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clock.bpr	24 Apr 2003 16:52:42 -0000	1.6
+++ clock.bpr	24 Apr 2003 21:17:53 -0000	1.7
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\clock.exe"/>
+    <PROJECT value="..\bcb6\clock.exe"/>
     <OBJFILES value="obj\clock.obj"/>
     <RESFILES value="clock.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="clock.bpf"/>
-    <INCLUDEPATH value="..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test;..;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test;..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk -src_suffix cpp 
-      -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\\obj -N0..\bcb6\\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -89,39 +89,47 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=5
-Item0=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item2=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=6
+Item0=..;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=4
-Item0=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item2=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=5
+Item0=..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: db_odbc.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/db_odbc.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_odbc.bpr	24 Apr 2003 16:52:43 -0000	1.1
+++ db_odbc.bpr	24 Apr 2003 21:17:54 -0000	1.2
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="\efltk\db_odbc.exe"/>
+    <PROJECT value="..\bcb6\db_odbc.exe"/>
     <OBJFILES value="obj\db_odbc.obj"/>
     <RESFILES value="db_odbc.res"/>
     <IDLFILES value=""/>
@@ -27,23 +27,23 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG;_WIN32"/>
+    <USERDEFINES value="_DEBUG;_WIN32;WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="db_odbc.bpf"/>
-    <INCLUDEPATH value="..\test\db;..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk"/>
-    <LIBPATH value="..\test\db;..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\test\db;..;..\test;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\test\db;..\lib;..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\test\db -I..\test -I$(BCB)\include -I$(BCB)\include\vcl -I\efltk 
-      -src_suffix cpp -D_DEBUG -D_WIN32 -boa"/>
+    <IDLCFLAGS value="-I..\test\db -I.. -I..\test -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_DEBUG -D_WIN32 -DWIN32 -boa"/>
     <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a4 -5 -b -k -y -v -vi- 
       -tWC -tWM- -c"/>
-    <PFLAGS value="-N2\efltk\bcb6\obj -N0\efltk\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-I\efltk\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-I..\bcb6\obj -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
@@ -90,41 +90,49 @@
 ProductVersion=1.0.0.0
 Comments=
 
+[Excluded Packages]
+f:\apps\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=6
-Item0=..\test\db;..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item1=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
-Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item3=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item4=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
-Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
+Count=7
+Item0=..;..\test;$(BCB)\include;$(BCB)\include\vcl;
+Item1=..\test\db;..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item2=..\test;$(BCB)\include;$(BCB)\include\vcl;\efltk
+Item3=..\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item4=..\test;R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item5=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl;R:\efltk
+Item6=R:\efltk\test;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=5
-Item0=..\test\db;..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item3=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
-Item4=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Count=6
+Item0=..\lib;..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\test\db;..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\test;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\test;$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item4=$(BCB)\Projects\Lib;R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
+Item5=R:\efltk\test;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=_DEBUG;_WIN32
-Item1=_DEBUG
+Count=3
+Item0=_DEBUG;_WIN32;WIN32
+Item1=_DEBUG;_WIN32
+Item2=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
-Count=2
-Item0=\efltk\bcb6\obj
-Item1=R:\efltk\bcb6\obj
+Count=3
+Item0=..\bcb6\obj
+Item1=\efltk\bcb6\obj
+Item2=R:\efltk\bcb6\obj
 
 [HistoryLists\hlFinalOutputDir]
-Count=2
-Item0=\efltk\
-Item1=R:\efltk\
+Count=3
+Item0=..\bcb6\
+Item1=\efltk\
+Item2=R:\efltk\
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Index: libefltk.bpr
===================================================================
RCS file: /cvsroot/ede/efltk/bcb6/libefltk.bpr,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- libefltk.bpr	24 Apr 2003 16:52:43 -0000	1.12
+++ libefltk.bpr	24 Apr 2003 21:17:54 -0000	1.13
@@ -4,54 +4,54 @@
   <MACROS>
     <VERSION value="BCB.06.00"/>
     <PROJECT value="..\lib\libefltk.lib"/>
-    <OBJFILES value="obj\cmap.obj obj\Fl.obj obj\Fl_abort.obj obj\Fl_add_idle.obj 
-      obj\fl_arc.obj obj\fl_arci.obj obj\Fl_arg.obj obj\Fl_Bitmap.obj 
-      obj\fl_blit.obj obj\fl_blit_1.obj obj\fl_blit_a.obj obj\fl_blit_n.obj 
-      obj\Fl_Bmp.obj obj\Fl_Boxtype.obj obj\fl_clip.obj obj\Fl_compose.obj 
-      obj\Fl_Config.obj obj\fl_cursor.obj obj\fl_curve.obj 
-      obj\Fl_Data_Fields.obj obj\Fl_Data_Source.obj obj\Fl_Date_Time.obj 
-      obj\fl_diamond_box.obj obj\Fl_display.obj obj\fl_dnd.obj obj\fl_draw.obj 
-      obj\fl_draw_image.obj obj\fl_draw_pixmap.obj obj\fl_font.obj 
-      obj\Fl_get_key.obj obj\Fl_Gif.obj obj\fl_glyph.obj obj\Fl_Group.obj 
-      obj\Fl_Image.obj obj\Fl_Image_Filter.obj obj\Fl_init.obj 
-      obj\Fl_key_name.obj obj\fl_labeltype.obj obj\fl_list_fonts.obj 
-      obj\Fl_Lists.obj obj\fl_load_plugin.obj obj\fl_locale.obj obj\fl_color.obj 
-      obj\Fl_lock.obj obj\fl_map.obj obj\fl_oval_box.obj obj\fl_overlay.obj 
-      obj\fl_overlay_visual.obj obj\Fl_own_colormap.obj obj\Fl_Pixmap.obj 
-      obj\fl_plastic_box.obj obj\fl_rect.obj obj\Fl_Renderer.obj obj\fl_rgb.obj 
-      obj\fl_round_box.obj obj\fl_rounded_box.obj obj\fl_scroll_area.obj 
-      obj\fl_shadow_box.obj obj\fl_stretch.obj obj\Fl_String.obj 
-      obj\Fl_Style.obj obj\Fl_Style_Set.obj obj\fl_theme.obj obj\Fl_Thread.obj 
-      obj\Fl_Util.obj obj\Fl_Variant.obj obj\fl_vertex.obj obj\Fl_visual.obj 
-      obj\Fl_Widget.obj obj\Fl_Window.obj obj\Fl_Window_fullscreen.obj 
-      obj\Fl_Window_hotspot.obj obj\Fl_Window_iconize.obj obj\Fl_WM.obj 
-      obj\Fl_Xpm.obj obj\Fl_Workspace.obj obj\Fl_Align_Group.obj obj\fl_ask.obj 
-      obj\Fl_Bar.obj obj\Fl_Box.obj obj\Fl_Browser.obj obj\Fl_Button.obj 
-      obj\Fl_Calendar.obj obj\Fl_Check_Button.obj obj\Fl_Choice.obj 
-      obj\Fl_Clock.obj obj\Fl_Color_Chooser.obj obj\Fl_Date_Time_Input.obj 
-      obj\Fl_Dial.obj obj\Fl_Dialog.obj obj\Fl_Directory_DS.obj 
-      obj\Fl_Double_Window.obj obj\fl_engraved_label.obj obj\Fl_File_Dialog.obj 
-      obj\Fl_FileBrowser.obj obj\Fl_FileInput.obj obj\Fl_Float_Input.obj 
-      obj\Fl_Help_Dialog.obj obj\Fl_Highlight_Button.obj obj\Fl_Input.obj 
-      obj\Fl_Input_Browser.obj obj\Fl_Item.obj obj\Fl_Light_Button.obj 
-      obj\Fl_ListView.obj obj\Fl_ListView_Header.obj obj\Fl_ListView_Item.obj 
-      obj\Fl_Main_Window.obj obj\Fl_Masked_Input.obj obj\Fl_MDI_Bar.obj 
-      obj\Fl_MDI_Window.obj obj\Fl_Menu.obj obj\Fl_Menu_.obj obj\Fl_Menu_add.obj 
-      obj\Fl_Menu_Bar.obj obj\Fl_Menu_Button.obj obj\Fl_Menu_global.obj 
-      obj\Fl_Menu_Item.obj obj\Fl_Menu_Window.obj obj\Fl_Multi_Image.obj 
-      obj\Fl_Numeric_Input.obj obj\Fl_Output.obj obj\Fl_Overlay_Window.obj 
-      obj\Fl_Pack.obj obj\Fl_Popup_Window.obj obj\Fl_ProgressBar.obj 
-      obj\Fl_Radio_Button.obj obj\Fl_Repeat_Button.obj obj\Fl_Return_Button.obj 
-      obj\Fl_Roller.obj obj\Fl_Scroll.obj obj\Fl_Scrollbar.obj 
-      obj\Fl_Shaped_Window.obj obj\fl_show_colormap.obj obj\Fl_Simple_Html.obj 
-      obj\Fl_Single_Window.obj obj\Fl_Slider.obj obj\fl_symbols.obj 
-      obj\Fl_Tabs.obj obj\Fl_Text_Buffer.obj obj\Fl_Text_Display.obj 
-      obj\Fl_Text_Editor.obj obj\Fl_Tile.obj obj\Fl_Tool_Bar.obj 
-      obj\Fl_Tooltip.obj obj\Fl_Valuator.obj obj\Fl_Value_Input.obj 
-      obj\Fl_Value_Slider.obj obj\vsnprintf.obj obj\fl_iconv_converters.obj 
-      obj\fl_converters.obj obj\Fl_Exception.obj obj\fl_utf8.obj obj\scandir.obj 
-      obj\filename_setext.obj obj\filename_list.obj obj\filename_match.obj 
-      obj\filename.obj obj\Fl_ODBC_Database.obj obj\fl_odbc.obj obj\Fl_Query.obj 
+    <OBJFILES value="obj\Fl.obj obj\Fl_abort.obj obj\Fl_add_idle.obj obj\fl_arc.obj 
+      obj\fl_arci.obj obj\Fl_arg.obj obj\Fl_Bitmap.obj obj\fl_blit.obj 
+      obj\fl_blit_1.obj obj\fl_blit_a.obj obj\fl_blit_n.obj obj\Fl_Bmp.obj 
+      obj\Fl_Boxtype.obj obj\fl_clip.obj obj\Fl_compose.obj obj\Fl_Config.obj 
+      obj\fl_cursor.obj obj\fl_curve.obj obj\Fl_Data_Fields.obj 
+      obj\Fl_Data_Source.obj obj\Fl_Date_Time.obj obj\fl_diamond_box.obj 
+      obj\Fl_display.obj obj\fl_dnd.obj obj\fl_draw.obj obj\fl_draw_image.obj 
+      obj\fl_draw_pixmap.obj obj\fl_font.obj obj\Fl_get_key.obj obj\Fl_Gif.obj 
+      obj\fl_glyph.obj obj\Fl_Group.obj obj\Fl_Image.obj obj\Fl_Image_Filter.obj 
+      obj\Fl_init.obj obj\Fl_key_name.obj obj\fl_labeltype.obj 
+      obj\fl_list_fonts.obj obj\Fl_Lists.obj obj\fl_load_plugin.obj 
+      obj\fl_locale.obj obj\fl_color.obj obj\Fl_lock.obj obj\fl_map.obj 
+      obj\fl_oval_box.obj obj\fl_overlay.obj obj\fl_overlay_visual.obj 
+      obj\Fl_own_colormap.obj obj\Fl_Pixmap.obj obj\fl_plastic_box.obj 
+      obj\fl_rect.obj obj\Fl_Renderer.obj obj\fl_rgb.obj obj\fl_round_box.obj 
+      obj\fl_rounded_box.obj obj\fl_scroll_area.obj obj\fl_shadow_box.obj 
+      obj\fl_stretch.obj obj\Fl_String.obj obj\Fl_Style.obj obj\Fl_Style_Set.obj 
+      obj\fl_theme.obj obj\Fl_Thread.obj obj\Fl_Util.obj obj\Fl_Variant.obj 
+      obj\fl_vertex.obj obj\Fl_visual.obj obj\Fl_Widget.obj obj\Fl_Window.obj 
+      obj\Fl_Window_fullscreen.obj obj\Fl_Window_hotspot.obj 
+      obj\Fl_Window_iconize.obj obj\Fl_WM.obj obj\Fl_Xpm.obj 
+      obj\Fl_Workspace.obj obj\Fl_Align_Group.obj obj\fl_ask.obj obj\Fl_Bar.obj 
+      obj\Fl_Box.obj obj\Fl_Browser.obj obj\Fl_Button.obj obj\Fl_Calendar.obj 
+      obj\Fl_Check_Button.obj obj\Fl_Choice.obj obj\Fl_Clock.obj 
+      obj\Fl_Color_Chooser.obj obj\Fl_Date_Time_Input.obj obj\Fl_Dial.obj 
+      obj\Fl_Dialog.obj obj\Fl_Directory_DS.obj obj\Fl_Double_Window.obj 
+      obj\fl_engraved_label.obj obj\Fl_File_Dialog.obj obj\Fl_FileBrowser.obj 
+      obj\Fl_FileInput.obj obj\Fl_Float_Input.obj obj\Fl_Help_Dialog.obj 
+      obj\Fl_Highlight_Button.obj obj\Fl_Input.obj obj\Fl_Input_Browser.obj 
+      obj\Fl_Item.obj obj\Fl_Light_Button.obj obj\Fl_ListView.obj 
+      obj\Fl_ListView_Header.obj obj\Fl_ListView_Item.obj obj\Fl_Main_Window.obj 
+      obj\Fl_Masked_Input.obj obj\Fl_MDI_Bar.obj obj\Fl_MDI_Window.obj 
+      obj\Fl_Menu.obj obj\Fl_Menu_.obj obj\Fl_Menu_add.obj obj\Fl_Menu_Bar.obj 
+      obj\Fl_Menu_Button.obj obj\Fl_Menu_global.obj obj\Fl_Menu_Item.obj 
+      obj\Fl_Menu_Window.obj obj\Fl_Multi_Image.obj obj\Fl_Numeric_Input.obj 
+      obj\Fl_Output.obj obj\Fl_Overlay_Window.obj obj\Fl_Pack.obj 
+      obj\Fl_Popup_Window.obj obj\Fl_ProgressBar.obj obj\Fl_Radio_Button.obj 
+      obj\Fl_Repeat_Button.obj obj\Fl_Return_Button.obj obj\Fl_Roller.obj 
+      obj\Fl_Scroll.obj obj\Fl_Scrollbar.obj obj\Fl_Shaped_Window.obj 
+      obj\fl_show_colormap.obj obj\Fl_Simple_Html.obj obj\Fl_Single_Window.obj 
+      obj\Fl_Slider.obj obj\fl_symbols.obj obj\Fl_Tabs.obj 
+      obj\Fl_Text_Buffer.obj obj\Fl_Text_Display.obj obj\Fl_Text_Editor.obj 
+      obj\Fl_Tile.obj obj\Fl_Tool_Bar.obj obj\Fl_Tooltip.obj obj\Fl_Valuator.obj 
+      obj\Fl_Value_Input.obj obj\Fl_Value_Slider.obj obj\vsnprintf.obj 
+      obj\fl_iconv_converters.obj obj\fl_converters.obj obj\Fl_Exception.obj 
+      obj\fl_utf8.obj obj\scandir.obj obj\filename_setext.obj 
+      obj\filename_list.obj obj\filename_match.obj obj\filename.obj 
+      obj\Fl_ODBC_Database.obj obj\fl_odbc.obj obj\Fl_Query.obj 
       obj\Fl_Params.obj obj\Fl_Database.obj obj\Fl_Buffer.obj 
       obj\Fl_PostScript.obj obj\Fl_Printer.obj obj\Fl_Memory_DS.obj 
       obj\Fl_IMAP_DS.obj obj\Fl_IMAP_Connect.obj obj\Fl_FTP_Connect.obj 
@@ -68,7 +68,7 @@
     <LIBFILES value=""/>
     <LIBRARIES value=""/>
     <PACKAGES value=""/>
-    <PATHCPP value=".;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\db\odbc;..\src\db\odbc;..\src\db;..\src\db;..\src\db;..\src\core;..\src\core;..\src\core;..\src\widgets;..\src\net;..\src\net;..\src\net;..\src\core;..\src\core;..\src\widgets;..\src\db;..\src\db;..\src\widgets;..\src\core;..\src\widgets;..\src\widgets;..\src\core;..\src\core;..\src\widgets;..\src\widgets"/>
+    <PATHCPP value=".;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\widgets;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\core;..\src\db\odbc;..\src\db\odbc;..\src\db;..\src\db;..\src\db;..\src\core;..\src\core;..\src\core;..\src\widgets;..\src\net;..\src\net;..\src\net;..\src\core;..\src\core;..\src\widgets;..\src\db;..\src\db;..\src\widgets;..\src\core;..\src\widgets;..\src\widgets;..\src\core;..\src\core;..\src\widgets;..\src\widgets"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -76,18 +76,17 @@
     <USERDEFINES value="_WIN32;WIN32;_DEBUG"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
     <MAINSOURCE value="libefltk.bpf"/>
-    <INCLUDEPATH value="..\src\net;..\src\db;..\src\db\odbc;..\src\widgets;..\src\core;$(BCB)\include;$(BCB)\include\vcl;.;.."/>
+    <INCLUDEPATH value="..\src\net;..\src\db;..\src\db\odbc;..\src\widgets;..\src\core;..\bcb6;..;$(BCB)\include;$(BCB)\include\vcl"/>
     <LIBPATH value="..\src\net;..\src\db;..\src\db\odbc;..\src\widgets;..\src\core;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w-par"/>
+    <WARNINGS value="-w-par -w-aus -wamb"/>
     <LISTFILE value=""/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
     <IDLCFLAGS value="-I..\src\net -I..\src\db -I..\src\db\odbc -I..\src\widgets -I..\src\core 
-      -I$(BCB)\include -I$(BCB)\include\vcl -I. -I.. -src_suffix cpp -D_WIN32 
-      -DWIN32 -D_DEBUG -boa"/>
-    <CFLAG1 value="-Od -H=obj\efltk.csm -Hc -P -Vx -Ve -xf -X- -r- -a4 -5 -b -d -k -y -v -vi- 
-      -c -tW -tWM"/>
+      -I..\bcb6 -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -D_WIN32 -DWIN32 -D_DEBUG -boa"/>
+    <CFLAG1 value="-Od -P -Vx -Ve -xf -X- -r- -a4 -5 -b -d -k -y -v -vi- -c -tW -tWM"/>
     <PFLAGS value="-N2..\bcb6\obj -N0..\bcb6\obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
     <AFLAGS value="/mx /w2 /zi"/>
     <LFLAGS value="-l..\lib /P256"/>
@@ -100,7 +99,6 @@
   </LINKER>
   <FILELIST>
       <FILE FILENAME="libefltk.bpf" FORMNAME="" UNITNAME="libefltk" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\src\core\cmap.cpp" FORMNAME="" UNITNAME="cmap.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FIL...
 
[truncated message content]