[sword-svn] r455 - in trunk: . rxlib stage
scribe at www.crosswire.org
scribe at www.crosswire.org
Sun Mar 11 16:04:36 MST 2007
Author: scribe
Date: 2007-03-11 16:04:36 -0700 (Sun, 11 Mar 2007)
New Revision: 455
Added:
trunk/README.txt
Modified:
trunk/RxRichEditX.cpp
trunk/rxlib/RxRichEdit.hpp
trunk/stage/layout.conf
Log:
Fixed FindText problem
Added README.txt to help people get started with checking out and compiling source.
Added: trunk/README.txt
===================================================================
--- trunk/README.txt (rev 0)
+++ trunk/README.txt 2007-03-11 23:04:36 UTC (rev 455)
@@ -0,0 +1,39 @@
+To build BibleCS (The SWORD Project for Windows), you will need to have:
+
+o a recent version of the free (or better) Borland Turbo C++ compiler
+ obtainable here:
+
+http://turboexplorer.com
+
+o an SVN client for obtaining all the latest source. TortoiseSVN
+ is obtainable here:
+
+http://tortoisesvn.tigris.org
+
+
+Step 1: Obtain all the necessary source and place it in the correct directory layout.
+
+For BibleCS to build, it expects source from some external packages to be located in the same parent directory as the BibleCS source. Here is a typical layout which will work fine:
+
+D:\src\biblecs
+D:\src\sword
+D:\src\icu-sword
+
+To obtain the source for all three of these projects, use your SVN client to check out each project to the same parent directory, under a subdirectory named the same as the project (as seen in our example layout above). The SVN URL for each project is given below:
+
+https://crosswire.org/svn/biblecs/trunk/
+https://crosswire.org/svn/sword/trunk/
+https://crosswire.org/svn/icu-sword/trunk/
+
+Step 2: Compiling.
+
+Browse to the folder where you checked out all of the projects in step 1, and then into the biblecs folder, and double-click on the file:
+
+swordprj.bdsgroup
+
+This should launch Turbo C++ (or better) and open the project.
+
+You should then select from the menu:
+
+Project | Build all projects
+
Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp 2007-03-11 21:39:06 UTC (rev 454)
+++ trunk/RxRichEditX.cpp 2007-03-11 23:04:36 UTC (rev 455)
@@ -16,12 +16,11 @@
#include <utilstr.h>
#include <stringmgr.h>
+// because stupid commdlg.h defines this and messes up our calls to our parent FindText method
+#undef FindText
+
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;
@@ -1011,14 +1010,14 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = FT("<a href=\"\">", start, len, TRichSearchTypes());
+ foundAt = FindText("<a href=\"\">", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
SelLength = 11;
this->SelText = "";
- endAt = FT("</a>", foundAt, len, TRichSearchTypes());
+ endAt = FindText("</a>", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = endAt;
@@ -1038,14 +1037,14 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = FT("<a href=\"\">", start, len, TRichSearchTypes());
+ foundAt = FindText("<a href=\"\">", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
SelLength = 11;
this->SelText = "";
- endAt = FT("</a>", foundAt, len, TRichSearchTypes());
+ endAt = FindText("</a>", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = endAt;
@@ -1065,11 +1064,11 @@
start = (SelLength) ? SelStart + SelLength : 0;
len = Text.Length() - start;
- foundAt = FT("<figure src=\"", start, len, TRichSearchTypes());
+ foundAt = FindText("<figure src=\"", start, len, TRichSearchTypes());
if (foundAt == -1)
break;
- endAt = FT("\" />", foundAt, len, TRichSearchTypes());
+ endAt = FindText("\" />", foundAt, len, TRichSearchTypes());
if (foundAt == -1)
break;
SelStart = foundAt;
Modified: trunk/rxlib/RxRichEdit.hpp
===================================================================
--- trunk/rxlib/RxRichEdit.hpp 2007-03-11 21:39:06 UTC (rev 454)
+++ trunk/rxlib/RxRichEdit.hpp 2007-03-11 23:04:36 UTC (rev 455)
@@ -30,6 +30,9 @@
#include <Menus.hpp> // Pascal unit
#include <Comctrls.hpp> // Pascal unit
+// because stupid commdlg.h defines this and messes up our calls to our parent FindText method
+#undef FindText
+
//-- user supplied -----------------------------------------------------------
namespace Rxriched
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2007-03-11 21:39:06 UTC (rev 454)
+++ trunk/stage/layout.conf 2007-03-11 23:04:36 UTC (rev 455)
@@ -39,26 +39,26 @@
Wesley=
[History]
-LastComModule=NETnotesfree
+LastComModule=JFB
LastLDKey=04210
LastLDModule=CBC
LastParaMod01=NETfree
LastParaMod02=NASB
LastParaMod03=ESV
-LastTextModule=NASB
-LastVerse=James 1:1
+LastTextModule=AraSVD
+LastVerse=Galatians 1:1
LookupSaveCount=5
+LookupText=Genesis 1:1
LookupText=James 1:1
LookupText=Psalms 5:1
LookupText=Ephesians 1:1
LookupText=Psalms 34:1
-LookupText=Romans 12:2
SearchSaveCount=5
+SearchText=نعمة
SearchText=the sword
SearchText=God love +world
SearchText=God love world
SearchText=kingdom
-SearchText=regeneration
[LDView]
2BabDict=
@@ -194,10 +194,10 @@
Cross-references=On
Footnotes=On
Headings=On
-Hebrew Cantillation=Off
+Hebrew Cantillation=On
Hebrew Vowel Points=On
-Morphological Tags=Off
-Strong's Numbers=Off
+Morphological Tags=On
+Strong's Numbers=On
Textual Variants=Primary Reading
Transliteration=Off
Words of Christ in Red=On
@@ -215,7 +215,7 @@
SearchTop=51
SearchWidth=759
TextComHeight=585
-TextWidth=613
+TextWidth=659
[TextView]
AB=
More information about the sword-cvs
mailing list