[sword-svn] r452 - in trunk: . stage
scribe at www.crosswire.org
scribe at www.crosswire.org
Sun Mar 11 10:38:54 MST 2007
Author: scribe
Date: 2007-03-11 10:38:54 -0700 (Sun, 11 Mar 2007)
New Revision: 452
Removed:
trunk/TntUnicodeControls/
trunk/rxlib/
Modified:
trunk/FontSel.cpp
trunk/FontSel.dfm
trunk/FontSel.h
trunk/PrintFrm.cpp
trunk/PrintFrm.dfm
trunk/RxRichEditX.cpp
trunk/TModuleFonts.cpp
trunk/TModuleFonts.dfm
trunk/mainfrm.cpp
trunk/mainfrm.dfm
trunk/mainfrm.h
trunk/optionfrm.cpp
trunk/optionfrm.dfm
trunk/optionfrm.h
trunk/searchfrm.cpp
trunk/searchfrm.dfm
trunk/stage/layout.conf
trunk/sword.bdsproj
trunk/sword.cpp
trunk/swordprj.bdsgroup
Log:
Preparing for updates to rxlib and tntcontrols.
Modified: trunk/FontSel.cpp
===================================================================
--- trunk/FontSel.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/FontSel.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -10,10 +10,10 @@
//---------------------------------------------------------------------------
#pragma package(smart_init)
-#pragma link "RxCombos"
-#pragma link "RxCombos"
-#pragma link "RxCombos"
-#pragma link "RxCombos"
+//#pragma link "RxCombos"
+//#pragma link "RxCombos"
+//#pragma link "RxCombos"
+//#pragma link "RxCombos"
#pragma resource "*.dfm"
TFontSelFrm *FontSelFrm;
//---------------------------------------------------------------------------
Modified: trunk/FontSel.dfm
===================================================================
--- trunk/FontSel.dfm 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/FontSel.dfm 2007-03-11 17:38:54 UTC (rev 452)
@@ -52,6 +52,9 @@
Height = 149
Align = alTop
TabOrder = 1
+ DesignSize = (
+ 363
+ 149)
object Label1: TLabel
Left = 8
Top = 6
@@ -184,12 +187,10 @@
end
end
object FGColorDlg: TColorDialog
- Ctl3D = True
Left = 312
Top = 72
end
object BGColorDlg: TColorDialog
- Ctl3D = True
Left = 312
Top = 104
end
Modified: trunk/FontSel.h
===================================================================
--- trunk/FontSel.h 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/FontSel.h 2007-03-11 17:38:54 UTC (rev 452)
@@ -46,7 +46,7 @@
int BackColor;
public: // User declarations
__fastcall TFontSelFrm(TComponent* Owner);
- TFontComboBox *FontComboBox;
+ TFontComboBox *FontComboBox;
TColorComboBox *BGColorCmb;
TColorComboBox *FGColorCmb;
void updateI18N();
Modified: trunk/PrintFrm.cpp
===================================================================
--- trunk/PrintFrm.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/PrintFrm.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -12,7 +12,7 @@
#include "PreviewForm.h"
//---------------------------------------------------------------------------
#pragma package(smart_init)
-#pragma link "RxCombos"
+//#pragma link "RxCombos"
#pragma resource "*.dfm"
TPrintForm *PrintForm;
Modified: trunk/PrintFrm.dfm
===================================================================
--- trunk/PrintFrm.dfm 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/PrintFrm.dfm 2007-03-11 17:38:54 UTC (rev 452)
@@ -1,10 +1,10 @@
object PrintForm: TPrintForm
Left = 275
Top = 210
- Width = 550
- Height = 310
AutoSize = True
Caption = 'The Sword Printer'
+ ClientHeight = 283
+ ClientWidth = 542
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -128,6 +128,10 @@
TabOrder = 1
object shtSelection: TTabSheet
Caption = 'Print Selection'
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
object GroupBox1: TGroupBox
Left = 10
Top = 14
@@ -138,7 +142,7 @@
object lblModName: TLabel
Left = 9
Top = 75
- Width = 160
+ Width = 66
Height = 13
Caption = 'Module Name'
end
@@ -176,7 +180,7 @@
Top = 91
Width = 264
Height = 21
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 3
end
end
@@ -190,7 +194,7 @@
object staticRange: TLabel
Left = 8
Top = 16
- Width = 125
+ Width = 46
Height = 13
Caption = 'Verse List'
end
@@ -214,6 +218,10 @@
object shtSetup: TTabSheet
Caption = 'Page Setup'
ImageIndex = 1
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
object GroupBox4: TGroupBox
Left = 8
Top = 8
@@ -263,12 +271,10 @@
Top = 53
Width = 17
Height = 21
- Min = 0
Max = 39
Position = 9
TabOrder = 1
Thousands = False
- Wrap = False
OnClick = spnLeftClick
end
object editBottom: TEdit
@@ -285,11 +291,9 @@
Top = 105
Width = 17
Height = 21
- Min = 0
Max = 39
Position = 14
TabOrder = 3
- Wrap = False
OnClick = spnBottomClick
end
object spnRight: TUpDown
@@ -297,11 +301,9 @@
Top = 55
Width = 17
Height = 21
- Min = 0
Max = 39
Position = 9
TabOrder = 4
- Wrap = False
OnClick = spnRightClick
end
object editRight: TEdit
@@ -318,11 +320,9 @@
Top = 103
Width = 17
Height = 21
- Min = 0
Max = 39
Position = 9
TabOrder = 6
- Wrap = False
OnClick = spnTopClick
end
object editTop: TEdit
@@ -401,6 +401,10 @@
object shtFormat: TTabSheet
Caption = 'Formatting Options'
ImageIndex = 2
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
object GroupBox3: TGroupBox
Left = 8
Top = 8
@@ -446,7 +450,6 @@
Max = 24
Position = 16
TabOrder = 0
- Wrap = False
end
object editHeading: TEdit
Left = 103
@@ -466,7 +469,6 @@
Max = 20
Position = 12
TabOrder = 2
- Wrap = False
end
object editBody: TEdit
Left = 103
@@ -486,7 +488,6 @@
Max = 20
Position = 10
TabOrder = 4
- Wrap = False
end
object editNumbers: TEdit
Left = 103
Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/RxRichEditX.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -18,6 +18,10 @@
char TRxRichEditX::platformID = 0;
+int FT(const char *text, int start, int len, const TRichSearchTypes &flags) {
+ return -1;
+}
+
TRxRichEditX::TRxRichEditX(TWinControl *parent) : TRxRichEdit(parent)
{
OSVERSIONINFO osvi;
@@ -1007,14 +1011,14 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = this->SearchText("<a href=\"\">", start, len, TRichSearchTypes());
+ foundAt = FT("<a href=\"\">", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
SelLength = 11;
this->SelText = "";
- endAt = this->SearchText("</a>", foundAt, len, TRichSearchTypes());
+ endAt = FT("</a>", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = endAt;
@@ -1034,14 +1038,14 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = this->SearchText("<a href=\"\">", start, len, TRichSearchTypes());
+ foundAt = FT("<a href=\"\">", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
SelLength = 11;
this->SelText = "";
- endAt = this->SearchText("</a>", foundAt, len, TRichSearchTypes());
+ endAt = FT("</a>", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = endAt;
@@ -1061,11 +1065,11 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = this->SearchText("<figure src=\"", start, len, TRichSearchTypes());
+ foundAt = FT("<figure src=\"", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
- endAt = this->SearchText("\" />", foundAt, len, TRichSearchTypes());
+ endAt = FT("\" />", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
Modified: trunk/TModuleFonts.cpp
===================================================================
--- trunk/TModuleFonts.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/TModuleFonts.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -9,7 +9,7 @@
//---------------------------------------------------------------------------
#pragma package(smart_init)
-#pragma link "RxCombos"
+//#pragma link "RxCombos"
#pragma resource "*.dfm"
TModuleFonts *ModuleFonts;
Modified: trunk/TModuleFonts.dfm
===================================================================
--- trunk/TModuleFonts.dfm 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/TModuleFonts.dfm 2007-03-11 17:38:54 UTC (rev 452)
@@ -1,9 +1,9 @@
object ModuleFonts: TModuleFonts
Left = 523
Top = 262
- Width = 300
- Height = 400
Caption = 'Select Module Fonts'
+ ClientHeight = 373
+ ClientWidth = 292
Color = clBtnFace
Constraints.MinHeight = 400
Constraints.MinWidth = 300
@@ -22,12 +22,16 @@
TextHeight = 13
object Panel1: TPanel
Left = 0
- Top = 313
+ Top = 332
Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
+ ExplicitTop = 313
+ DesignSize = (
+ 292
+ 41)
object btnReset: TBitBtn
Left = 82
Top = 8
@@ -70,7 +74,7 @@
Left = 0
Top = 0
Width = 292
- Height = 272
+ Height = 291
Align = alClient
BevelOuter = bvNone
Caption = 'Panel2'
@@ -81,6 +85,7 @@
Font.Style = []
ParentFont = False
TabOrder = 1
+ ExplicitHeight = 272
object Panel4: TPanel
Left = 0
Top = 0
@@ -101,27 +106,32 @@
Left = 0
Top = 32
Width = 292
- Height = 240
+ Height = 259
Align = alClient
HideSelection = False
Indent = 19
ReadOnly = True
TabOrder = 1
OnChange = installTreeChange
+ ExplicitHeight = 240
end
end
object Panel3: TPanel
Left = 0
- Top = 272
+ Top = 291
Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 2
+ ExplicitTop = 272
+ DesignSize = (
+ 292
+ 41)
object Label2: TLabel
Left = 7
Top = 8
- Width = 70
+ Width = 52
Height = 13
Anchors = [akLeft, akBottom]
Caption = 'Font Name'
@@ -129,7 +139,7 @@
object Label3: TLabel
Left = 188
Top = 8
- Width = 56
+ Width = 44
Height = 13
Anchors = [akRight, akBottom]
Caption = 'Font Size'
Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/mainfrm.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -35,14 +35,14 @@
#include "PrintFrm.h"
#include "PreviewForm.h"
//---------------------------------------------------------------------------
-#pragma link "RxRichEd"
+//#pragma link "RxRichEd"
//#pragma link "MOZILLACONTROLLib_OCX"
//#pragma link "SHDocVw_OCX"
-#pragma link "TntButtons"
-#pragma link "TntComCtrls"
-#pragma link "TntExtCtrls"
-#pragma link "TntMenus"
-#pragma link "Unicode"
+//#pragma link "TntButtons"
+//#pragma link "TntComCtrls"
+//#pragma link "TntExtCtrls"
+//#pragma link "TntMenus"
+//#pragma link "Unicode"
#pragma resource "*.dfm"
static const char *rtfclasses[] = {"RTFDisp", "SWDisplay", "SWObject", 0};
@@ -2290,7 +2290,7 @@
TVariant *TargetFrameName, TVariant *PostData, TVariant *Headers,
TOLEBOOL *Cancel)
{
- AnsiString url = *URL;
+ AnsiString url = (AnsiString)*URL;
SWBuf stuff = url.c_str();
char *offset = strstr(url.c_str(), "passage");
if (offset > 0) {
@@ -2713,10 +2713,17 @@
}
//------------------------------------------------------------------------------------------//
+
+void __fastcall TRTFHintWindow::NCPaint(HDC DC)
+{
+
+}
+
+
void __fastcall TRTFHintWindow::Paint(void)
{
TRect Rect = ClientRect;
-
+
TColor penColor;
SWBuf strColor;
strColor = Form1->optionsconf->Sections["Appearance"]["PopupFontColor"];
@@ -2803,6 +2810,7 @@
DT_RIGHT|DT_NOPREFIX|DT_WORDBREAK|DrawTextBiDiModeFlagsReadingOnly() );
*/
}
+
//------------------------------------------------------------------------------------------//
void __fastcall TRTFHintWindow::ActivateHint(const /*Windows::*/TRect& Rect,
Modified: trunk/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/mainfrm.h
===================================================================
--- trunk/mainfrm.h 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/mainfrm.h 2007-03-11 17:38:54 UTC (rev 452)
@@ -40,8 +40,8 @@
#include <AppEvnts.hpp>
#include <TntStdCtrls.hpp>
#include <ActnList.hpp>
-#include "TntButtons.hpp"
-#include "TntComCtrls.hpp"
+//#include "TntButtons.hpp"
+//#include "TntComCtrls.hpp"
#include "TntExtCtrls.hpp"
#include "TntMenus.hpp"
@@ -438,6 +438,7 @@
typedef THintWindow inherited;
protected:
+ virtual void __fastcall NCPaint(HDC DC);
virtual void __fastcall Paint(void);
virtual void __fastcall CreateParams(TCreateParams &Params);
Modified: trunk/optionfrm.cpp
===================================================================
--- trunk/optionfrm.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/optionfrm.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -16,11 +16,11 @@
//---------------------------------------------------------------------------
-#pragma link "TntButtons"
-#pragma link "TntComCtrls"
-#pragma link "TntExtCtrls"
-#pragma link "TntMenus"
-#pragma link "TntStdCtrls"
+//#pragma link "TntButtons"
+//#pragma link "TntComCtrls"
+//#pragma link "TntExtCtrls"
+//#pragma link "TntMenus"
+//#pragma link "TntStdCtrls"
#pragma resource "*.dfm"
TOptionsfrm *Optionsfrm;
Modified: trunk/optionfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/optionfrm.h
===================================================================
--- trunk/optionfrm.h 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/optionfrm.h 2007-03-11 17:38:54 UTC (rev 452)
@@ -13,8 +13,8 @@
#include "FontSel.h"
#include <Buttons.hpp>
#include <Menus.hpp>
-#include "TntButtons.hpp"
-#include "TntComCtrls.hpp"
+//#include "TntButtons.hpp"
+//#include "TntComCtrls.hpp"
#include "TntExtCtrls.hpp"
#include "TntMenus.hpp"
#include "TntStdCtrls.hpp"
Modified: trunk/searchfrm.cpp
===================================================================
--- trunk/searchfrm.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/searchfrm.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -8,7 +8,7 @@
#include "mainfrm.h"
#include <regex.h>
#include "RangeMaintFrm.h"
-#include <unicode.hpp>
+//#include <unicode.hpp>
#include <unicodertf.h>
#include "rtfhintfrm.h"
#include <localemgr.h>
Modified: trunk/searchfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/stage/layout.conf 2007-03-11 17:38:54 UTC (rev 452)
@@ -45,7 +45,7 @@
LastParaMod01=NETfree
LastParaMod02=NASB
LastParaMod03=ESV
-LastTextModule=FarsiOPV
+LastTextModule=NASB
LastVerse=James 1:1
LookupSaveCount=5
LookupText=James 1:1
Modified: trunk/sword.bdsproj
===================================================================
--- trunk/sword.bdsproj 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/sword.bdsproj 2007-03-11 17:38:54 UTC (rev 452)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppVCLApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{9122559A-8631-4C12-A0A3-C0D96CB72441}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
+ <Option Name="ProjectType">CppVCLApplication</Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{9122559A-8631-4C12-A0A3-C0D96CB72441}</Option>
+ </Option>
+ </PersonalityInfo>
+ <CPlusPlusBuilder.Personality>
+ <BCBPROJECT>
<project version="10.0">
<property category="build.config" name="active" value="0"/>
<property category="build.config" name="count" value="1"/>
@@ -36,6 +36,10 @@
<property category="build.platform" name="win32.default" value="win32b"/>
<property category="build.platform" name="win32.enabled" value="1"/>
<property category="build.platform" name="win32.win32b.enabled" value="1"/>
+ <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
+ <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
+ <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
+ <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
<property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
<property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
<property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
@@ -50,7 +54,7 @@
<property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
<property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
<property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
+ <property category="win32.Debug_Build.win32b.dcc32" name="param.filenames.merge" value="1"/>
<property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
<property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
<property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
@@ -82,18 +86,21 @@
<property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="U_HAVE_PLACEMENT_NEW=0"/>
<property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="USELUCENE"/>
<property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="_CL_DISABLE_MULTITHREADING"/>
+ <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="U_HAVE_INT8_T=1"/>
<property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
<property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\sword\src\modules\filters"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.10" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="D:\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="TntUnicodeControls"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\icu-sword\source\common"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="..\sword\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="rxlib"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.10" value="$(BDS)\include\vcl"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.11" value="rxlib"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.12" value="$(BDS)\include\dinkumware"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\sword\src\modules\filters"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="D:\"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="TntUnicodeControls"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="..\icu-sword\source\common"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\icu-sword\source\i18n"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\sword\include"/>
+ <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="$(BDS)\include"/>
<property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
<property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
@@ -133,15 +140,33 @@
<property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="rxlib"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="obj"/>
<property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib\obj"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="rxlib"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="rxlib"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value="rxlib"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value=".\"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.5" value="$(BDS)\lib"/>
+ <property category="win32.*.win32b.dcc32" name="option.U.arg.6" value="$(BDS)\lib\obj"/>
<property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
<property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
@@ -153,15 +178,17 @@
<property category="win32.*.win32b.idl2cpp" name="option.D.arg.6" value="_CL_DISABLE_MULTITHREADING"/>
<property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\sword\src\modules\filters"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="D:\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="TntUnicodeControls"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\icu-sword\source\common"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="..\sword\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.8" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="rxlib"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.10" value="$(BDS)\include\vcl"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.11" value="rxlib"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\sword\src\modules\filters"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="D:\."/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="TntUnicodeControls"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="..\icu-sword\source\common"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="..\icu-sword\source\i18n"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.8" value="..\sword\include"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="$(BDS)\include"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
@@ -174,20 +201,27 @@
<property category="win32.*.win32b.ilink32" name="option.I.arg.1" value="obj"/>
<property category="win32.*.win32b.ilink32" name="option.I.arg.merge" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\sword\src\modules\filters"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="D:\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="TntUnicodeControls"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="..\sword\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\Projects\Lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.6" value="rxlib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.7" value="$(BDS)\lib\release"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.8" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.9" value="$(BDS)\lib"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.10" value="$(BDS)\lib\obj"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.11" value="$(BDS)\lib"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\sword\src\modules\filters"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="D:\"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="TntUnicodeControls"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.6" value="..\sword\lib"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.7" value="$(BDS)\Projects\Lib"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.8" value="rxlib"/>
+ <property category="win32.*.win32b.ilink32" name="option.L.arg.9" value="$(BDS)\lib\release"/>
<property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.aa.enabled" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="TntUnicodeConrols"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.2" value="rxlib"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.3" value="TntUnicodeControls\Source"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="stage\"/>
<property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
@@ -244,23 +278,12 @@
<FILE FILENAME="DevOfTheDay.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="DevOfTheDay" FORMNAME="DevOfTheDay2" DESIGNCLASS=""/>
<FILE FILENAME="SplashPage.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="SplashPage" FORMNAME="SplashPg" DESIGNCLASS=""/>
<FILE FILENAME="FontSel.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="FontSel" FORMNAME="FontSelFrm" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\Rxcombos.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Rxcombos" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\Vclutils.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Vclutils" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\Rxcconst.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Rxcconst" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\Rxconst.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Rxconst" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="StudyProfessor.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="StudyProfessor" FORMNAME="Form3" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\RxRichEd.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="RxRichEd" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="rxlib\Maxmin.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Maxmin" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="TModuleFonts.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="TModuleFonts" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="rtfhintfrm.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rtfhintfrm" FORMNAME="RTFHintForm" DESIGNCLASS=""/>
<FILE FILENAME="RxRichEditX.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="RxRichEditX" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="PreviewForm.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="PreviewForm" FORMNAME="PreviewForm" DESIGNCLASS=""/>
<FILE FILENAME="PrintFrm.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="PrintFrm" FORMNAME="PrintForm" DESIGNCLASS=""/>
- <FILE FILENAME="TntUnicodeControls\Unicode.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="Unicode" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="TntUnicodeControls\TntControls.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="TntControls" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="TntUnicodeControls\TntForms.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="TntForms" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="TntUnicodeControls\TntStdCtrls.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="TntStdCtrls" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="TntUnicodeControls\TntClasses.obj" CONTAINERID="OBJTool" LOCALCOMMAND="" UNITNAME="TntClasses" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="paraldisp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="paraldisp" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
@@ -270,6 +293,30 @@
<FILE FILENAME="swdisprtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swdisprtf" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="swwinlog.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swwinlog" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\RxRichEd.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="RxRichEd" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\rxMaxmin.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="rxMaxmin" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="entryprvfrm.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="entryprvfrm" FORMNAME="entryPreviewForm" DESIGNCLASS="" ADDITIONAL="entryprvfrm.h"/>
+ <FILE FILENAME="rxlib\RxCombos.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="RxCombos" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\rrxcombo.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="rrxcombo" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\rxVclutils.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="rxVclutils" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\Rxconst.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="Rxconst" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="rxlib\Rxcconst.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="Rxcconst" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntActnList.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntActnList" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntClasses.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntClasses" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntClipBrd.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntClipBrd" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntControls.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntControls" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntDialogs.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntDialogs" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntExtCtrls.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntExtCtrls" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntFormatStrUtils.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntFormatStrUtils" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntForms.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntForms" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntGraphics.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntGraphics" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntMenus.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntMenus" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntStdActns.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntStdActns" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntStdCtrls.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntStdCtrls" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntSystem.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntSystem" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntSysUtils.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntSysUtils" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntWideStrUtils.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntWideStrUtils" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="TntUnicodeConrols\TntWindows.pas" CONTAINERID="PascalCompiler" LOCALCOMMAND="" UNITNAME="TntWindows" FORMNAME="" DESIGNCLASS=""/>
</FILELIST>
<IDEOPTIONS>
<VersionInfo>
@@ -277,8 +324,8 @@
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">5</VersionInfo>
- <VersionInfo Name="Release">8</VersionInfo>
- <VersionInfo Name="Build">2</VersionInfo>
+ <VersionInfo Name="Release">9</VersionInfo>
+ <VersionInfo Name="Build">7</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
@@ -289,14 +336,14 @@
</VersionInfo>
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName">CrossWire Software & Bible Society</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">Windows 32bit User Interface to The SWORD Project</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.5.8.2</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">Windows User Interface to The SWORD Project</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.5.9.7</VersionInfoKeys>
<VersionInfoKeys Name="InternalName">biblecs</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright">(c) 1990-2006 CrossWire Bible Society under the terms of the GNU General Public License</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName">The SWORD Project</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.5.8</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.5.9</VersionInfoKeys>
<VersionInfoKeys Name="Comments">Seek Him and you will find Him</VersionInfoKeys>
</VersionInfoKeys>
<HistoryLists_hlIncludePath>
@@ -392,6 +439,11 @@
<Parameters Name="LoadAllSymbols">True</Parameters>
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
</Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
<Linker>
<Linker Name="LibPrefix"></Linker>
<Linker Name="LibSuffix"></Linker>
@@ -399,8 +451,9 @@
</Linker>
</IDEOPTIONS>
</BCBPROJECT>
- <Source>
- <Source Name="MainSource">sword.cpp</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
+ <Source>
+ <Source Name="MainSource">sword.cpp</Source>
+ </Source>
+ <buildevents/>
+ </CPlusPlusBuilder.Personality>
</BorlandProject>
Modified: trunk/sword.cpp
===================================================================
--- trunk/sword.cpp 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/sword.cpp 2007-03-11 17:38:54 UTC (rev 452)
@@ -9,14 +9,12 @@
using namespace sword;
-USERES("sword.res");
USEFORM("mainfrm.cpp", Form1);
USEFORM("AboutBoxfrm.cpp", AboutBox);
USEFORM("bookmarkfrm.cpp", bookmarkForm);
USEFORM("newbmfilefrm.cpp", NewBMfrm);
USEFORM("optionfrm.cpp", Optionsfrm);
USEFORM("searchfrm.cpp", searchForm);
-USEUNIT("biblecsmgr.cpp");
USEFORM("ModInstForm.cpp", ModInstFrm);
USEFORM("vrslstfrm.cpp", VerseListForm);
USEFORM("editentryfrm.cpp", EditEntryForm);
@@ -26,33 +24,11 @@
USEFORM("DevOfTheDay.cpp", DevOfTheDay2);
USEFORM("SplashPage.cpp", SplashPg);
USEFORM("FontSel.cpp", FontSelFrm);
-USEOBJ("rxlib\Rxcombos.obj");
-USEOBJ("rxlib\Vclutils.obj");
-USEOBJ("rxlib\Rxcconst.obj");
-USEOBJ("rxlib\Rxconst.obj");
USEFORM("StudyProfessor.cpp", Form3);
-USEOBJ("rxlib\RxRichEd.obj");
-USEOBJ("rxlib\Maxmin.obj");
-USEUNIT("TModuleFonts.cpp");
USEFORM("rtfhintfrm.cpp", RTFHintForm);
-USEUNIT("RxRichEditX.cpp");
USEFORM("PreviewForm.cpp", PreviewForm);
USEFORM("PrintFrm.cpp", PrintForm);
-USEUNIT("paraldisp.cpp");
-USELIB("..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\sword\lib\libsword.lib");
-USEUNIT("swdisprtfchap.cpp");
-USEUNIT("swdisprtf.cpp");
-USEUNIT("swwinlog.cpp");
-USELIB("clucene\clucene.lib");
USEFORM("entryprvfrm.cpp", entryPreviewForm);
-USEOBJ("TntUnicodeControls.attic\Unicode.obj");
-USEOBJ("TntUnicodeControls.attic\TntClasses.obj");
-USEOBJ("TntUnicodeControls.attic\TntControls.obj");
-USEOBJ("TntUnicodeControls.attic\TntForms.obj");
-USEOBJ("TntUnicodeControls.attic\TntStdCtrls.obj");
//---------------------------------------------------------------------------
AnsiString startVerse = "";
Modified: trunk/swordprj.bdsgroup
===================================================================
--- trunk/swordprj.bdsgroup 2007-03-10 21:28:07 UTC (rev 451)
+++ trunk/swordprj.bdsgroup 2007-03-11 17:38:54 UTC (rev 452)
@@ -1,23 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">Default.Personality</Option>
- <Option Name="ProjectType"></Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{2F9C5529-BDC8-4A16-BBEB-50FFD34BBA2C}</Option>
- </Option>
- </PersonalityInfo>
- <Default.Personality>
-
- <Projects>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">Default.Personality</Option>
+ <Option Name="ProjectType"></Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{2F9C5529-BDC8-4A16-BBEB-50FFD34BBA2C}</Option>
+ </Option>
+ </PersonalityInfo>
+ <Default.Personality> <Projects>
<Projects Name="icuuc.lib">..\icu-sword\as_is\borland\icuuc.bdsproj</Projects>
<Projects Name="icuin.lib">..\icu-sword\as_is\borland\icuin.bdsproj</Projects>
<Projects Name="clucene.lib">clucene\clucene.bdsproj</Projects>
<Projects Name="libsword.lib">..\sword\lib\bcppmake\libsword.bdsproj</Projects>
- <Projects Name="TntLibR.bpl">TntUnicodeControls\BCB5\TntLibR.bdsproj</Projects>
<Projects Name="sword.exe">sword.bdsproj</Projects>
- <Projects Name="Targets">icuuc.lib icuin.lib clucene.lib libsword.lib TntLibR.bpl sword.exe</Projects>
+ <Projects Name="Targets">icuuc.lib icuin.lib clucene.lib libsword.lib sword.exe</Projects>
</Projects>
<Dependencies/>
</Default.Personality>
More information about the sword-cvs
mailing list