[sword-cvs] sword/apps/windoze/vc/ActiveDiatheke ActiveDiathekeCtl.cpp,1.7,1.8 ActiveDiatheke.dsw,1.1,1.2 ActiveDiatheke.dsp,1.9,1.10

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke
In directory www:/tmp/cvs-serv607

Modified Files:
	ActiveDiathekeCtl.cpp ActiveDiatheke.dsw ActiveDiatheke.dsp 
Log Message:
patch from Lynn Allan

Index: ActiveDiathekeCtl.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiathekeCtl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ActiveDiathekeCtl.cpp	19 Mar 2002 08:12:53 -0000	1.7
+++ ActiveDiathekeCtl.cpp	22 Oct 2003 01:40:16 -0000	1.8
@@ -271,8 +271,20 @@
 long CActiveDiathekeCtrl::query() 
 {
 	ostrstream output;
+  char *range = 0;  //lda
 	unsigned char opt = (m_strongs ? OP_STRONGS : 0) + (m_footnotes ? OP_FOOTNOTES : 0) + (m_headings ? OP_HEADINGS : 0) + (m_morphology ? OP_MORPH : 0) + (m_gaccents ? OP_GREEKACCENTS : 0) + (m_hpoints ? OP_HEBREWPOINTS : 0) + (m_hcantillation ? OP_CANTILLATION : 0) + (!m_script.IsEmpty() ? OP_TRANSLITERATOR : 0) + (m_variants ? OP_VARIANTS : 0) + (m_scripref ? OP_SCRIPREF : 0) + (m_arshape ? OP_ARSHAPE : 0) + (m_bidireorder ? OP_BIDI : 0);
-	doquery(m_maxverses, m_outputformat + 1, m_outputencoding + 1, opt, m_searchtype, (LPCTSTR)m_book, (LPCTSTR)m_locale, (LPCTSTR)m_key, &output, (LPCTSTR)m_script, m_variants);
+	doquery(m_maxverses, 
+          m_outputformat + 1, 
+          m_outputencoding + 1, 
+          opt, 
+          m_searchtype, 
+          range,                   //lda
+          (LPCTSTR)m_book, 
+          (LPCTSTR)m_locale, 
+          (LPCTSTR)m_key, 
+          &output, 
+          (LPCTSTR)m_script, 
+          m_variants);
 	output << '\0';
 	char* versevalue = output.str();
 	if (versevalue) {

Index: ActiveDiatheke.dsw
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiatheke.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ActiveDiatheke.dsw	10 May 2001 21:53:36 -0000	1.1
+++ ActiveDiatheke.dsw	22 Oct 2003 01:40:16 -0000	1.2
@@ -11,6 +11,21 @@
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libsword
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libsword"=..\..\..\..\lib\vcppmake\vc6\libsword.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
 }}}
 
 ###############################################################################

Index: ActiveDiatheke.dsp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiatheke.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ActiveDiatheke.dsp	27 Jul 2003 00:21:38 -0000	1.9
+++ ActiveDiatheke.dsp	22 Oct 2003 01:40:16 -0000	1.10
@@ -58,7 +58,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 libswordvc6.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../../../lib"
 # Begin Custom Build - Registering ActiveX Control...
 OutDir=.\Release
 TargetPath=.\Release\ActiveDiatheke.ocx
@@ -98,7 +98,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
[...1067 lines suppressed...]
-SOURCE=..\..\..\..\include\zld.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\include\zlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\include\zstr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\include\ztext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\include\zverse.h
 # End Source File
 # End Group
 # Begin Source File