[sword-svn] r459 - in branches: . BCB5 BCB5/stage

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-09-09 15:55:10 -0700 (Sun, 09 Sep 2007)
New Revision: 459

Added:
   branches/BCB5/
Modified:
   branches/BCB5/RxRichEditX.cpp
   branches/BCB5/stage/layout.conf
   branches/BCB5/sword.bpr
   branches/BCB5/sword.res
Log:
Branching last known good BCB revision

Copied: branches/BCB5 (from rev 451, trunk)

Modified: branches/BCB5/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp	2007-03-10 21:28:07 UTC (rev 451)
+++ branches/BCB5/RxRichEditX.cpp	2007-09-09 22:55:10 UTC (rev 459)
@@ -281,6 +281,7 @@
 
 	delete RTFStream;
 	makeLinks();
+     makeImages();
 }
 
 
@@ -1061,7 +1062,7 @@
 
 		start = (SelLength) ? SelStart + SelLength : 0;
 		len = Text.Length() - start;
-		foundAt = this->SearchText("<figure src=\"", start, len, TRichSearchTypes());
+		foundAt = this->SearchText("<img src=\"", start, len, TRichSearchTypes());
 		if (foundAt == -1)
 			break;
 
@@ -1078,7 +1079,6 @@
 
 
 void TRxRichEditX::insertImage(const char *filePath) {
-/*
 //static char *tmp = "D:/Program Files/Borland/Borland Shared/Images/Buttons/alarm.bmp";
 //filePath=tmp;
 	TImage *image = new TImage(this);
@@ -1086,7 +1086,7 @@
 	Graphics::TBitmap *bitmap = new Graphics::TBitmap();
 	try {
 	int len = strlen(filePath);
-	if ((len > 4) && (!stricmp(filePath+(len-4), ".jpg"))) {
+	if ((len > 4) && (!::stricmp(filePath+(len-4), ".jpg"))) {
 //		ji->LoadFromFile(filePath);
 
 
@@ -1104,14 +1104,13 @@
 //		image->Picture->Bitmap->Assign(ji);
 	}
 	else	image->Picture->LoadFromFile(filePath);
-	
+
 	insertRTF(bitmapToRTF(image->Picture->Bitmap));
 	}
 	catch (...){}
 	delete ji;
 	delete image;
 	delete bitmap;
-*/
 }
 
 

Modified: branches/BCB5/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf	2007-03-10 21:28:07 UTC (rev 451)
+++ branches/BCB5/stage/layout.conf	2007-09-09 22:55:10 UTC (rev 459)
@@ -40,8 +40,8 @@
 
 [History]
 LastComModule=NETnotesfree
-LastLDKey=04210
-LastLDModule=CBC
+LastLDKey=DAVID
+LastLDModule=ImageSampler
 LastParaMod01=NETfree
 LastParaMod02=NASB
 LastParaMod03=ESV
@@ -169,6 +169,7 @@
 HebrewGreek=
 Hitchcock=
 ISBE=
+ImageSampler=
 KJVD=
 NasbGreek=
 NasbHebrew=
@@ -214,7 +215,7 @@
 SearchResCol0Width=175
 SearchTop=51
 SearchWidth=759
-TextComHeight=585
+TextComHeight=254
 TextWidth=613
 
 [TextView]

Modified: branches/BCB5/sword.bpr
===================================================================
--- trunk/sword.bpr	2007-03-10 21:28:07 UTC (rev 451)
+++ branches/BCB5/sword.bpr	2007-09-09 22:55:10 UTC (rev 459)
@@ -46,7 +46,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
     <INCLUDEPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls.attic;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -60,11 +60,11 @@
       -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_ 
       -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE 
       -D_CL_DISABLE_MULTITHREADING"/>
-    <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+    <CFLAG1 value="-Od -Vx -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&quot;&quot; -aa -Tpe -GD -s -Gn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -78,7 +78,7 @@
 MajorVer=1
 MinorVer=5
 Release=9
-Build=6
+Build=7
 Debug=0
 PreRelease=0
 Special=0
@@ -90,7 +90,7 @@
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.5.9.6
+FileVersion=1.5.9.7
 InternalName=biblecs
 LegalCopyright=(c) 1990-2006 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=
@@ -146,8 +146,8 @@
 
 [HistoryLists\hlConditionals]
 Count=16
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
 Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
 Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
 Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE

Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)