[sword-cvs] biblecs/CBuilder6 sword.bpr,1.10,1.11 sword.cpp,1.6,1.7 swordprj.bpg,1.6,1.7

sword@www.crosswire.org sword@www.crosswire.org
Tue, 23 Dec 2003 20:25:39 -0700


Update of /cvs/core/biblecs/CBuilder6
In directory www:/tmp/cvs-serv31934/CBuilder6

Modified Files:
	sword.bpr sword.cpp swordprj.bpg 
Log Message:
no message

Index: sword.bpr
===================================================================
RCS file: /cvs/core/biblecs/CBuilder6/sword.bpr,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sword.bpr	21 Nov 2003 22:30:30 -0000	1.10
+++ sword.bpr	24 Dec 2003 03:25:37 -0000	1.11
@@ -4,44 +4,31 @@
   <MACROS>
     <VERSION value="BCB.06.00"/>
     <PROJECT value="stage\sword.exe"/>
-    <OBJFILES value="obj\sword.obj obj\vrslstfrm.obj obj\AboutBoxfrm.obj obj\bookmarkfrm.obj 
-      obj\DevOfTheDay.obj obj\editentryfrm.obj obj\FontSel.obj 
+    <OBJFILES value="obj\sword.obj obj\AboutBoxfrm.obj obj\biblecsmgr.obj obj\bookmarkfrm.obj 
+      obj\DevOfTheDay.obj obj\editentryfrm.obj obj\FontSel.obj obj\mainfrm.obj 
       obj\ModInstForm.obj obj\ModVisFrm.obj obj\newbmfilefrm.obj 
-      obj\optionfrm.obj obj\RangeMaintFrm.obj obj\searchfrm.obj 
-      obj\splashfrm.obj obj\SplashPage.obj obj\StudyProfessor.obj 
-      obj\versesel.obj obj\TModuleFonts.obj obj\biblecsmgr.obj 
-      obj\RxRichEditX.obj obj\PreviewForm.obj obj\PrintFrm.obj obj\swwinlog.obj 
-      obj\swdisprtf.obj obj\swdisprtfchap.obj obj\rtfhintfrm.obj obj\mainfrm.obj 
-      obj\paraldisp.obj"/>
+      obj\optionfrm.obj obj\paraldisp.obj obj\PreviewForm.obj obj\PrintFrm.obj 
+      obj\RangeMaintFrm.obj obj\rtfhintfrm.obj obj\RxRichEditX.obj 
+      obj\searchfrm.obj obj\splashfrm.obj obj\SplashPage.obj 
+      obj\StudyProfessor.obj obj\swdisprtf.obj obj\swdisprtfchap.obj 
+      obj\swwinlog.obj obj\tbdisp.obj obj\TModuleFonts.obj obj\versesel.obj 
+      obj\vrslstfrm.obj"/>
     <RESFILES value="sword.res"/>
     <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES) ..\..\CBuilder5\BibleCS\vrslstfrm.dfm 
-      ..\..\CBuilder5\BibleCS\AboutBoxfrm.dfm 
-      ..\..\CBuilder5\BibleCS\bookmarkfrm.dfm 
-      ..\..\CBuilder5\BibleCS\DevOfTheDay.dfm 
-      ..\..\CBuilder5\BibleCS\editentryfrm.dfm 
-      ..\..\CBuilder5\BibleCS\FontSel.dfm 
-      ..\..\CBuilder5\BibleCS\ModInstForm.dfm ..\..\CBuilder5\BibleCS\ModVisFrm.dfm 
-      ..\..\CBuilder5\BibleCS\newbmfilefrm.dfm 
-      ..\..\CBuilder5\BibleCS\optionfrm.dfm 
-      ..\..\CBuilder5\BibleCS\RangeMaintFrm.dfm 
-      ..\..\CBuilder5\BibleCS\searchfrm.dfm 
-      ..\..\CBuilder5\BibleCS\splashfrm.dfm ..\..\CBuilder5\BibleCS\SplashPage.dfm 
-      ..\..\CBuilder5\BibleCS\StudyProfessor.dfm 
-      ..\..\CBuilder5\BibleCS\versesel.dfm 
-      ..\..\CBuilder5\BibleCS\TModuleFonts.dfm 
-      ..\..\CBuilder5\BibleCS\PreviewForm.dfm 
-      ..\..\CBuilder5\BibleCS\PrintFrm.dfm 
-      ..\..\CBuilder5\BibleCS\rtfhintfrm.dfm ..\..\CBuilder5\BibleCS\mainfrm.dfm"/>
-    <LIBFILES value="..\..\..\..\lib\libsword6icu.lib 
-      ..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\TntLibR.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icuuc.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icuin.lib"/>
+    <RESDEPEN value="$(RESFILES) ..\AboutBoxfrm.dfm ..\bookmarkfrm.dfm ..\DevOfTheDay.dfm 
+      ..\editentryfrm.dfm ..\FontSel.dfm ..\mainfrm.dfm ..\ModInstForm.dfm 
+      ..\ModVisFrm.dfm ..\newbmfilefrm.dfm ..\optionfrm.dfm ..\PreviewForm.dfm 
+      ..\PrintFrm.dfm ..\RangeMaintFrm.dfm ..\rtfhintfrm.dfm ..\searchfrm.dfm 
+      ..\splashfrm.dfm ..\SplashPage.dfm ..\StudyProfessor.dfm 
+      ..\TModuleFonts.dfm ..\versesel.dfm ..\vrslstfrm.dfm"/>
+    <LIBFILES value="..\..\icu-sword\as_is\borland\icuucbcb6.lib 
+      ..\..\icu-sword\as_is\borland\icuinbcb6.lib 
+      ..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\sword\lib\libsword6icu.lib ..\TntUnicodeControls\BCB6\TntLibR.lib"/>
     <LIBRARIES value="bcbsmp.lib dclocx.lib bcbie.lib vclx.lib rtl.lib vcl.lib"/>
     <SPARELIBS value="vcl.lib rtl.lib vclx.lib bcbie.lib dclocx.lib bcbsmp.lib"/>
     <PACKAGES value="vcl.bpi rtl.bpi vclx.bpi bcbie.bpi"/>
-    <PATHCPP value=".;..\..\CBuilder5\BibleCS;..\.."/>
+    <PATHCPP value=".;.."/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -51,8 +38,8 @@
     <USERDEFINES value="_DEBUG;_ICU_;_ICUSWORD_;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
-    <INCLUDEPATH value="..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls"/>
-    <LIBPATH value="..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;rxlib;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6"/>
+    <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\sword\include;..\..\icu-sword\source\common;..\..\icu-sword\source\i18n;..\TntUnicodeControls"/>
+    <LIBPATH value="..\;..;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\obj;$(BCB)\lib;..\TntUnicodeControls"/>
     <WARNINGS value="-w-par"/>
     <OTHERFILES value=""/>
   </MACROS>
@@ -73,38 +60,39 @@
   <FILELIST>
       <FILE FILENAME="sword.res" FORMNAME="" UNITNAME="sword.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="sword.cpp" FORMNAME="" UNITNAME="sword" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\vrslstfrm.cpp" FORMNAME="VerseListForm" UNITNAME="vrslstfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\AboutBoxfrm.cpp" FORMNAME="AboutBox" UNITNAME="AboutBoxfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\bookmarkfrm.cpp" FORMNAME="bookmarkForm" UNITNAME="bookmarkfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\DevOfTheDay.cpp" FORMNAME="DevOfTheDay2" UNITNAME="DevOfTheDay" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\editentryfrm.cpp" FORMNAME="EditEntryForm" UNITNAME="editentryfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\FontSel.cpp" FORMNAME="FontSelFrm" UNITNAME="FontSel" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\ModInstForm.cpp" FORMNAME="ModInstFrm" UNITNAME="ModInstForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\ModVisFrm.cpp" FORMNAME="ModVisForm" UNITNAME="ModVisFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\newbmfilefrm.cpp" FORMNAME="NewBMfrm" UNITNAME="newbmfilefrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\optionfrm.cpp" FORMNAME="Optionsfrm" UNITNAME="optionfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\RangeMaintFrm.cpp" FORMNAME="RangeMaintForm" UNITNAME="RangeMaintFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\searchfrm.cpp" FORMNAME="searchForm" UNITNAME="searchfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\splashfrm.cpp" FORMNAME="splashForm" UNITNAME="splashfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\SplashPage.cpp" FORMNAME="SplashPg" UNITNAME="SplashPage" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\StudyProfessor.cpp" FORMNAME="Form3" UNITNAME="StudyProfessor" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\versesel.cpp" FORMNAME="VerseSelFrm" UNITNAME="versesel" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\TModuleFonts.cpp" FORMNAME="ModuleFonts" UNITNAME="TModuleFonts" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\biblecsmgr.cpp" FORMNAME="" UNITNAME="biblecsmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\RxRichEditX.cpp" FORMNAME="" UNITNAME="RxRichEditX.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\PreviewForm.cpp" FORMNAME="PreviewForm" UNITNAME="PreviewForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\PrintFrm.cpp" FORMNAME="PrintForm" UNITNAME="PrintFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\swwinlog.cpp" FORMNAME="" UNITNAME="swwinlog.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\swdisprtf.cpp" FORMNAME="" UNITNAME="swdisprtf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\swdisprtfchap.cpp" FORMNAME="" UNITNAME="swdisprtfchap.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\rtfhintfrm.cpp" FORMNAME="RTFHintForm" UNITNAME="rtfhintfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\mainfrm.cpp" FORMNAME="Form1" UNITNAME="mainfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword6icu.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\TntLibR.lib" FORMNAME="" UNITNAME="TntLibR.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\CBuilder5\BibleCS\paraldisp.cpp" FORMNAME="" UNITNAME="paraldisp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icuuc.lib" FORMNAME="" UNITNAME="icuuc.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icuin.lib" FORMNAME="" UNITNAME="icuin.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuucbcb6.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuinbcb6.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\sword\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword6icu.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\TntUnicodeControls\BCB6\TntLibR.lib" FORMNAME="" UNITNAME="TntLibR.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\AboutBoxfrm.cpp" FORMNAME="AboutBox" UNITNAME="AboutBoxfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\biblecsmgr.cpp" FORMNAME="" UNITNAME="biblecsmgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\bookmarkfrm.cpp" FORMNAME="bookmarkForm" UNITNAME="bookmarkfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\DevOfTheDay.cpp" FORMNAME="DevOfTheDay2" UNITNAME="DevOfTheDay" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\editentryfrm.cpp" FORMNAME="EditEntryForm" UNITNAME="editentryfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\FontSel.cpp" FORMNAME="FontSelFrm" UNITNAME="FontSel" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\mainfrm.cpp" FORMNAME="Form1" UNITNAME="mainfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\ModInstForm.cpp" FORMNAME="ModInstFrm" UNITNAME="ModInstForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\ModVisFrm.cpp" FORMNAME="ModVisForm" UNITNAME="ModVisFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\newbmfilefrm.cpp" FORMNAME="NewBMfrm" UNITNAME="newbmfilefrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\optionfrm.cpp" FORMNAME="Optionsfrm" UNITNAME="optionfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\paraldisp.cpp" FORMNAME="" UNITNAME="paraldisp.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\PreviewForm.cpp" FORMNAME="PreviewForm" UNITNAME="PreviewForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\PrintFrm.cpp" FORMNAME="PrintForm" UNITNAME="PrintFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\RangeMaintFrm.cpp" FORMNAME="RangeMaintForm" UNITNAME="RangeMaintFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\rtfhintfrm.cpp" FORMNAME="RTFHintForm" UNITNAME="rtfhintfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\RxRichEditX.cpp" FORMNAME="" UNITNAME="RxRichEditX.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\searchfrm.cpp" FORMNAME="searchForm" UNITNAME="searchfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\splashfrm.cpp" FORMNAME="splashForm" UNITNAME="splashfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\SplashPage.cpp" FORMNAME="SplashPg" UNITNAME="SplashPage" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\StudyProfessor.cpp" FORMNAME="Form3" UNITNAME="StudyProfessor" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\swdisprtf.cpp" FORMNAME="" UNITNAME="swdisprtf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\swdisprtfchap.cpp" FORMNAME="" UNITNAME="swdisprtfchap.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\swwinlog.cpp" FORMNAME="" UNITNAME="swwinlog.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\tbdisp.cpp" FORMNAME="" UNITNAME="tbdisp.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\TModuleFonts.cpp" FORMNAME="ModuleFonts" UNITNAME="TModuleFonts" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\versesel.cpp" FORMNAME="VerseSelFrm" UNITNAME="versesel" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\vrslstfrm.cpp" FORMNAME="VerseListForm" UNITNAME="vrslstfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>
   </BUILDTOOLS>
@@ -138,41 +126,49 @@
 Comments=
 
 [HistoryLists\hlIncludePath]
-Count=17
-Item0=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls
-Item1=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls;rxlib
-Item2=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls
-Item3=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls
-Item4=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls
-Item5=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
-Item6=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
-Item7=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder6\BibleCS
-Item8=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
-Item9=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
-Item10=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units
-Item11=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units
-Item12=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls
-Item13=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\..\include;..\TntUnicodeControls
-Item14=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\..\include;TntUnicodeControls
-Item15=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item16=..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects;D:\cvs\crosswire\sword\apps\windoze\CBuilder6\BibleCS;$(BCB)\include;$(BCB)\include\vcl
+Count=20
+Item0=..\;..;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\sword\include;..\..\icu-sword\source\common;..\..\icu-sword\source\i18n;..\TntUnicodeControls
+Item1=..\;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\sword\include;..\..\icu-sword\source\common;..\..\icu-sword\source\i18n;..\TntUnicodeControls
+Item2=..\;..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls
+Item3=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;rxlib;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls
+Item4=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls;rxlib
+Item5=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls
+Item6=..\..\..\..\src\utilfuns;..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls
+Item7=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls
+Item8=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item9=..\..;..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
+Item10=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;C:\sword\apps\windoze\CBuilder6\BibleCS
+Item11=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;..\..\CBuilder5\BibleCS\TntUnicodeControls;RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
+Item12=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n
+Item13=..\..;..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units
+Item14=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls;RxLib\Units
+Item15=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include;TntUnicodeControls
+Item16=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\..\include;..\TntUnicodeControls
+Item17=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\..\include;TntUnicodeControls
+Item18=..\..\CBuilder5\BibleCS;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item19=..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects;D:\cvs\crosswire\sword\apps\windoze\CBuilder6\BibleCS;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=14
-Item0=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;rxlib;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
-Item1=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6;rxlib
-Item2=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
-Item3=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6
-Item4=$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6
-Item5=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls
-Item6=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj
-Item7=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder6\BibleCS
-Item8=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj
-Item9=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;..\..\CBuilder5\BibleCS\TntUnicodeControls
-Item10=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
-Item11=..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
-Item12=..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
-Item13=..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects;D:\cvs\crosswire\sword\apps\windoze\CBuilder6\BibleCS;$(BCB)\lib\obj;$(BCB)\lib
+Count=19
+Item0=..\;..;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\obj;$(BCB)\lib;..\TntUnicodeControls
+Item1=..\;..;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\obj;$(BCB)\lib;..\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item2=..\;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\obj;$(BCB)\lib;..\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item3=..\;..;..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;rxlib;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item4=..\;..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;rxlib;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item5=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;rxlib;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item6=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6;rxlib
+Item7=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\Projects\RxLib\Units;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item8=..\..\..\..\src\utilfuns;$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item9=$(BCB)\Projects\Lib;.;..\..;..\..\CBuilder5\BibleCS;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder5\BibleCS\TntUnicodeControls\BCB6
+Item10=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls
+Item11=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj
+Item12=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj;C:\sword\apps\windoze\CBuilder6\BibleCS
+Item13=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;..\..\CBuilder5\BibleCS\TntUnicodeControls;..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\obj
+Item14=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;..\..\CBuilder5\BibleCS\TntUnicodeControls
+Item15=$(BCB)\Projects\Lib;..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
+Item16=..\..;..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
+Item17=..\..\CBuilder5\BibleCS;.;$(BCB)\lib\obj;$(BCB)\lib;RxLib\Units;TntUnicodeControls
+Item18=..\..\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects;D:\cvs\crosswire\sword\apps\windoze\CBuilder6\BibleCS;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1

Index: sword.cpp
===================================================================
RCS file: /cvs/core/biblecs/CBuilder6/sword.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sword.cpp	12 Jul 2003 18:48:31 -0000	1.6
+++ sword.cpp	24 Dec 2003 03:25:37 -0000	1.7
@@ -3,27 +3,27 @@
 #include <vcl.h>
 #pragma hdrstop
 //---------------------------------------------------------------------------
-USEFORM("..\..\CBuilder5\BibleCS\vrslstfrm.cpp", VerseListForm);
-USEFORM("..\..\CBuilder5\BibleCS\AboutBoxfrm.cpp", AboutBox);
-USEFORM("..\..\CBuilder5\BibleCS\bookmarkfrm.cpp", bookmarkForm);
-USEFORM("..\..\CBuilder5\BibleCS\DevOfTheDay.cpp", DevOfTheDay2);
-USEFORM("..\..\CBuilder5\BibleCS\editentryfrm.cpp", EditEntryForm);
-USEFORM("..\..\CBuilder5\BibleCS\FontSel.cpp", FontSelFrm);
-USEFORM("..\..\CBuilder5\BibleCS\ModInstForm.cpp", ModInstFrm);
-USEFORM("..\..\CBuilder5\BibleCS\ModVisFrm.cpp", ModVisForm);
-USEFORM("..\..\CBuilder5\BibleCS\newbmfilefrm.cpp", NewBMfrm);
-USEFORM("..\..\CBuilder5\BibleCS\optionfrm.cpp", Optionsfrm);
-USEFORM("..\..\CBuilder5\BibleCS\RangeMaintFrm.cpp", RangeMaintForm);
-USEFORM("..\..\CBuilder5\BibleCS\searchfrm.cpp", searchForm);
-USEFORM("..\..\CBuilder5\BibleCS\splashfrm.cpp", splashForm);
-USEFORM("..\..\CBuilder5\BibleCS\SplashPage.cpp", SplashPg);
-USEFORM("..\..\CBuilder5\BibleCS\StudyProfessor.cpp", Form3);
-USEFORM("..\..\CBuilder5\BibleCS\versesel.cpp", VerseSelFrm);
-USEFORM("..\..\CBuilder5\BibleCS\TModuleFonts.cpp", ModuleFonts);
-USEFORM("..\..\CBuilder5\BibleCS\PreviewForm.cpp", PreviewForm);
-USEFORM("..\..\CBuilder5\BibleCS\PrintFrm.cpp", PrintForm);
-USEFORM("..\..\CBuilder5\BibleCS\rtfhintfrm.cpp", RTFHintForm);
-USEFORM("..\..\CBuilder5\BibleCS\mainfrm.cpp", Form1);
+USEFORM("..\AboutBoxfrm.cpp", AboutBox);
+USEFORM("..\bookmarkfrm.cpp", bookmarkForm);
+USEFORM("..\DevOfTheDay.cpp", DevOfTheDay2);
+USEFORM("..\editentryfrm.cpp", EditEntryForm);
+USEFORM("..\FontSel.cpp", FontSelFrm);
+USEFORM("..\mainfrm.cpp", Form1);
+USEFORM("..\ModInstForm.cpp", ModInstFrm);
+USEFORM("..\ModVisFrm.cpp", ModVisForm);
+USEFORM("..\newbmfilefrm.cpp", NewBMfrm);
+USEFORM("..\optionfrm.cpp", Optionsfrm);
+USEFORM("..\PreviewForm.cpp", PreviewForm);
+USEFORM("..\PrintFrm.cpp", PrintForm);
+USEFORM("..\RangeMaintFrm.cpp", RangeMaintForm);
+USEFORM("..\rtfhintfrm.cpp", RTFHintForm);
+USEFORM("..\searchfrm.cpp", searchForm);
+USEFORM("..\splashfrm.cpp", splashForm);
+USEFORM("..\SplashPage.cpp", SplashPg);
+USEFORM("..\StudyProfessor.cpp", Form3);
+USEFORM("..\TModuleFonts.cpp", ModuleFonts);
+USEFORM("..\versesel.cpp", VerseSelFrm);
+USEFORM("..\vrslstfrm.cpp", VerseListForm);
 //---------------------------------------------------------------------------
 AnsiString startVerse = "";
 
@@ -34,9 +34,7 @@
         {
                  Application->Initialize();
                  Application->Title = "SWORD Project for Windows";
-                 Application->CreateForm(__classid(TForm1), &Form1);
-		Application->CreateForm(__classid(TVerseListForm), &VerseListForm);
-		Application->CreateForm(__classid(TAboutBox), &AboutBox);
+                 Application->CreateForm(__classid(TAboutBox), &AboutBox);
 		Application->CreateForm(__classid(TbookmarkForm), &bookmarkForm);
 		Application->CreateForm(__classid(TDevOfTheDay2), &DevOfTheDay2);
 		Application->CreateForm(__classid(TEditEntryForm), &EditEntryForm);
@@ -45,16 +43,17 @@
 		Application->CreateForm(__classid(TModVisForm), &ModVisForm);
 		Application->CreateForm(__classid(TNewBMfrm), &NewBMfrm);
 		Application->CreateForm(__classid(TOptionsfrm), &Optionsfrm);
+		Application->CreateForm(__classid(TPreviewForm), &PreviewForm);
+		Application->CreateForm(__classid(TPrintForm), &PrintForm);
 		Application->CreateForm(__classid(TRangeMaintForm), &RangeMaintForm);
+		Application->CreateForm(__classid(TRTFHintForm), &RTFHintForm);
 		Application->CreateForm(__classid(TsearchForm), &searchForm);
 		Application->CreateForm(__classid(TsplashForm), &splashForm);
 		Application->CreateForm(__classid(TSplashPg), &SplashPg);
 		Application->CreateForm(__classid(TForm3), &Form3);
-		Application->CreateForm(__classid(TVerseSelFrm), &VerseSelFrm);
 		Application->CreateForm(__classid(TModuleFonts), &ModuleFonts);
-		Application->CreateForm(__classid(TPreviewForm), &PreviewForm);
-		Application->CreateForm(__classid(TPrintForm), &PrintForm);
-		Application->CreateForm(__classid(TRTFHintForm), &RTFHintForm);
+		Application->CreateForm(__classid(TVerseSelFrm), &VerseSelFrm);
+		Application->CreateForm(__classid(TVerseListForm), &VerseListForm);
 		Application->Run();
         }
         catch (Exception &exception)

Index: swordprj.bpg
===================================================================
RCS file: /cvs/core/biblecs/CBuilder6/swordprj.bpg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- swordprj.bpg	10 Sep 2003 06:49:58 -0000	1.6
+++ swordprj.bpg	24 Dec 2003 03:25:37 -0000	1.7
@@ -9,7 +9,7 @@
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = libsword6icu.lib TntLibR.bpl icuuc.lib icuin.lib sword.exe
+PROJECTS = icuinbcb6.lib icuucbcb6.lib libsword6icu.lib TntLibR.bpl sword.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -18,19 +18,19 @@
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-TntLibR.bpl: ..\..\CBuilder5\BibleCS\TntUnicodeControls\BCB6\TntLibR.bpk
+TntLibR.bpl: ..\TntUnicodeControls\BCB6\TntLibR.bpk
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-libsword6icu.lib: ..\..\..\..\lib\bcppmake\libsword6icu.bpr
+libsword6icu.lib: ..\..\sword\lib\bcppmake\libsword6icu.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-icuuc.lib: ..\..\..\..\..\icu-sword\as_is\borland\icuuc.bpr
+icuinbcb6.lib: ..\..\icu-sword\as_is\borland\icuinbcb6.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-icuin.lib: ..\..\..\..\..\icu-sword\as_is\borland\icuin.bpr
+icuucbcb6.lib: ..\..\icu-sword\as_is\borland\icuucbcb6.bpr
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak