diff options
Diffstat (limited to 'apps/windoze/CBuilder5/BibleCS')
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp | 3 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/ModVisFrm.h | 3 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h | 3 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/RxRichEditX.h | 1 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp | 1 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/biblecsmgr.h | 3 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h | 4 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/mainfrm.h | 1 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.bpr | 40 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.cpp | 4 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.res | bin | 1968 -> 1968 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/swordlib.bpr | 42 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/swordlib.cpp | 2 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/versesel.cpp | 3 |
14 files changed, 66 insertions, 44 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp index 64f791e..db7e092 100644 --- a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp +++ b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp @@ -4,6 +4,9 @@ #pragma hdrstop #include "ModVisFrm.h" + +using namespace std; + //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma resource "*.dfm" diff --git a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h index d3fa99d..b65ab82 100644 --- a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h +++ b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h @@ -13,6 +13,9 @@ #include <swconfig.h> #include <swmgr.h> #include <ComCtrls.hpp> + +using namespace sword; + //--------------------------------------------------------------------------- class TModVisForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h b/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h index e279783..bf6fe85 100644 --- a/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h +++ b/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h @@ -10,6 +10,9 @@ #include <Buttons.hpp> #include <ExtCtrls.hpp> #include <swconfig.h> + +using namespace sword; +using namespace std; //--------------------------------------------------------------------------- class TRangeMaintForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h index 8afb652..0d021a7 100644 --- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h +++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h @@ -10,6 +10,7 @@ #include <swmodule.h> #include <listkey.h> +using namespace sword; struct RTF_FORMAT { AnsiString fontFace; // Font Name diff --git a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp index b2e0ba5..54859d4 100644 --- a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp +++ b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp @@ -7,6 +7,7 @@ #include <utf8bidireorder.h> #include <utf8transliterator.h> #endif +using namespace std; //--------------------------------------------------------------------------- BibleCSMGR::BibleCSMGR(TModInstFrm *iModInstFrm) : SWMgr(0, 0, false, new MarkupFilterMgr(FMT_RTF, ENC_RTF)) { diff --git a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h index d9dbc97..5aa3950 100644 --- a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h +++ b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h @@ -3,6 +3,9 @@ #define biblecsmgrH #include <swmgr.h> #include "ModInstForm.h" + +using namespace sword; + //--------------------------------------------------------------------------- enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE }; diff --git a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h index 41c606a..04a004e 100644 --- a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h +++ b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h @@ -10,6 +10,10 @@ #include <swconfig.h> #include <vcl\Menus.hpp> #include <list> + +using namespace sword; +using namespace std; + //--------------------------------------------------------------------------- class TbookmarkForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.h b/apps/windoze/CBuilder5/BibleCS/mainfrm.h index 0b2c342..04466a0 100644 --- a/apps/windoze/CBuilder5/BibleCS/mainfrm.h +++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.h @@ -53,6 +53,7 @@ #define MONITOR_WORKAREA 0x0002 // use monitor work area #define MONITOR_AREA 0x0000 // use monitor entire area +using namespace std; class RTFDisp : public SWDisplay { SWDispRTF *edit; diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index d801535..b9eb01f 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -43,7 +43,7 @@ <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="ilink32"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="sword.cpp"/> <INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/> @@ -55,16 +55,16 @@ <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/> - <CFLAG1 value="-O2 -Vx -Ve -RT- -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/> - <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zn"/> - <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn"/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0w32.obj $(OBJFILES)"/> <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/> + <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/> </LINKER> <IDEOPTIONS> [Version Info] @@ -73,7 +73,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=5 Release=4 -Build=125 +Build=127 Debug=0 PreRelease=0 Special=0 @@ -85,7 +85,7 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project -FileVersion=1.5.4.125 +FileVersion=1.5.4.127 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License LegalTrademarks= @@ -124,14 +124,15 @@ Count=1 Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] -Count=7 -Item0=_ICU_;_ICUSWORD_;USBINARY -Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY -Item2=_ICU_;_ICUSWORD_;_DEBUG -Item3=_ICU_;_ICUSWORD_ -Item4=_ICU_ -Item5=_ICU_;_DEBUG -Item6=_DEBUG +Count=8 +Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item1=_ICU_;_ICUSWORD_;USBINARY +Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY +Item3=_ICU_;_ICUSWORD_;_DEBUG +Item4=_ICU_;_ICUSWORD_ +Item5=_ICU_ +Item6=_ICU_;_DEBUG +Item7=_DEBUG [HistoryLists\hlIntOutputDir] Count=2 @@ -158,11 +159,6 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= +LinkCGLIB=1 </IDEOPTIONS> </PROJECT>
\ No newline at end of file diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp index 13a52d3..277b859 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.cpp +++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp @@ -7,6 +7,8 @@ #include "sword.h" #include <thmlplain.h> +using namespace sword; + USERES("sword.res"); USEFORM("mainfrm.cpp", Form1); USEFORM("AboutBoxfrm.cpp", AboutBox); @@ -192,3 +194,5 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in + + diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res Binary files differindex 3e9ab0d..138d1ab 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.res +++ b/apps/windoze/CBuilder5/BibleCS/sword.res diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr index ece7bec..a280a48 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr @@ -40,12 +40,11 @@ ..\..\..\..\obj\crc32.obj ..\..\..\..\obj\adler32.obj ..\..\..\..\obj\gzio.obj ..\..\..\..\obj\untgz.obj ..\..\..\..\obj\unicodertf.obj ..\..\..\..\obj\gbfmorph.obj - ..\..\..\..\obj\thmlolb.obj ..\..\..\..\obj\roman.obj - ..\..\..\..\obj\gbfhtmlhref.obj ..\..\..\..\obj\latin1utf8.obj - ..\..\..\..\obj\latin1utf16.obj ..\..\..\..\obj\scsuutf8.obj - ..\..\..\..\obj\swbasicfilter.obj ..\..\..\..\obj\thmlhtmlhref.obj - ..\..\..\..\obj\utf8cantillation.obj ..\..\..\..\obj\utf8greekaccents.obj - ..\..\..\..\obj\utf8hebrewpoints.obj + ..\..\..\..\obj\thmlolb.obj ..\..\..\..\obj\gbfhtmlhref.obj + ..\..\..\..\obj\latin1utf8.obj ..\..\..\..\obj\latin1utf16.obj + ..\..\..\..\obj\scsuutf8.obj ..\..\..\..\obj\swbasicfilter.obj + ..\..\..\..\obj\thmlhtmlhref.obj ..\..\..\..\obj\utf8cantillation.obj + ..\..\..\..\obj\utf8greekaccents.obj ..\..\..\..\obj\utf8hebrewpoints.obj ..\..\..\..\obj\utf8transliterator.obj ..\..\..\..\obj\utf8utf16.obj ..\..\..\..\obj\utf16utf8.obj ..\..\..\..\obj\utf8latin1.obj ..\..\..\..\obj\utf8html.obj ..\..\..\..\obj\thmlscripref.obj @@ -62,7 +61,7 @@ ..\..\..\..\obj\thmlvariants.obj ..\..\..\..\obj\swcacher.obj ..\..\..\..\obj\greeklexattribs.obj ..\..\..\..\obj\gbfosis.obj ..\..\..\..\obj\thmlosis.obj ..\..\..\..\obj\installmgr.obj - ..\..\..\..\obj\ftpparse.obj"/> + ..\..\..\..\obj\ftpparse.obj ..\..\..\..\obj\roman.obj"/> <RESFILES value=""/> <IDLFILES value=""/> <IDLGENFILES value=""/> @@ -79,7 +78,7 @@ <DEBUGLIBPATH value=""/> <RELEASELIBPATH value=""/> <LINKER value="TLib"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL"/> <MAINSOURCE value="swordlib.cpp"/> <INCLUDEPATH value="..\InstallMgr\curl\include;..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/> @@ -108,11 +107,11 @@ -I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr -I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_DEBUG"/> - <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 - -4 -b- -k- -vi -c -g0 -tWM"/> - <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx + -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -g0 -tWM"/> + <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zn"/> + <AFLAGS value="/mx /w2 /zi"/> <LFLAGS value="/P512"/> </OPTIONS> <LINKER> @@ -163,14 +162,15 @@ Item4=..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys [HistoryLists\hlConditionals] -Count=7 -Item0=_ICU_;_ICUSWORD_;USBINARY -Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY -Item2=_ICU_;_ICUSWORD_;_DEBUG -Item3=_ICU_;_ICUSWORD_ -Item4=_ICU_ -Item5=_ICU_;_DEBUG -Item6=_DEBUG +Count=8 +Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item1=_ICU_;_ICUSWORD_;USBINARY +Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY +Item3=_ICU_;_ICUSWORD_;_DEBUG +Item4=_ICU_;_ICUSWORD_ +Item5=_ICU_ +Item6=_ICU_;_DEBUG +Item7=_DEBUG [HistoryLists\hlIntOutputDir] Count=2 @@ -200,7 +200,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 +LinkCGLIB=1 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.cpp b/apps/windoze/CBuilder5/BibleCS/swordlib.cpp index d0a8acc..4984417 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.cpp +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.cpp @@ -73,7 +73,6 @@ USEUNIT("..\..\..\..\src\utilfuns\zlib\untgz.c"); USEUNIT("..\..\..\..\src\modules\filters\unicodertf.cpp"); USEUNIT("..\..\..\..\src\modules\filters\gbfmorph.cpp"); USEUNIT("..\..\..\..\src\modules\filters\thmlolb.cpp"); -USEUNIT("..\..\..\..\src\utilfuns\roman.c"); USEUNIT("..\..\..\..\src\modules\filters\gbfhtmlhref.cpp"); USEUNIT("..\..\..\..\src\modules\filters\latin1utf8.cpp"); USEUNIT("..\..\..\..\src\modules\filters\latin1utf16.cpp"); @@ -116,6 +115,7 @@ USEUNIT("..\..\..\..\src\modules\filters\gbfosis.cpp"); USEUNIT("..\..\..\..\src\modules\filters\thmlosis.cpp"); USEUNIT("..\..\..\..\src\mgr\installmgr.cpp"); USEUNIT("..\..\..\..\src\utilfuns\ftpparse.c"); +USEUNIT("..\..\..\..\src\utilfuns\roman.cpp"); //--------------------------------------------------------------------------- #define Library diff --git a/apps/windoze/CBuilder5/BibleCS/versesel.cpp b/apps/windoze/CBuilder5/BibleCS/versesel.cpp index 8788580..0c87480 100644 --- a/apps/windoze/CBuilder5/BibleCS/versesel.cpp +++ b/apps/windoze/CBuilder5/BibleCS/versesel.cpp @@ -8,6 +8,9 @@ #pragma package(smart_init) #pragma resource "*.dfm" TVerseSelFrm *VerseSelFrm; + +using namespace sword; + //--------------------------------------------------------------------------- __fastcall TVerseSelFrm::TVerseSelFrm(TComponent* Owner) : TForm(Owner) |