[sword-cvs] sword/apps/windoze/vc/ActiveDiatheke ActiveDiathekeCtl.h,1.5,1.6 ActiveDiathekeCtl.cpp,1.8,1.9 ActiveDiatheke.odl,1.4,1.5

[sword@www.crosswire.org]

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

Modified Files:
	ActiveDiathekeCtl.h ActiveDiathekeCtl.cpp ActiveDiatheke.odl 
Log Message:
made search scope accessible

Index: ActiveDiathekeCtl.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiathekeCtl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ActiveDiathekeCtl.h	19 Mar 2002 08:12:53 -0000	1.5
+++ ActiveDiathekeCtl.h	22 Oct 2003 03:13:12 -0000	1.6
@@ -87,6 +87,8 @@
 	afx_msg void OnBidireorderChanged();
 	short m_outputencoding;
 	afx_msg void OnOutputencodingChanged();
+	CString m_range;
+	afx_msg void OnRangeChanged();
 	afx_msg long query();
 	//}}AFX_DISPATCH
 	DECLARE_DISPATCH_MAP()
@@ -123,7 +125,8 @@
 	dispidArshape = 19L,
 	dispidBidireorder = 20L,
 	dispidOutputencoding = 21L,
-	dispidQuery = 22L,
+	dispidRange = 22L,
+	dispidQuery = 23L,
 	eventidValueChanged = 1L,
 	//}}AFX_DISP_ID
 	};

Index: ActiveDiathekeCtl.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiathekeCtl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ActiveDiathekeCtl.cpp	22 Oct 2003 01:40:16 -0000	1.8
+++ ActiveDiathekeCtl.cpp	22 Oct 2003 03:13:12 -0000	1.9
@@ -56,6 +56,7 @@
 	DISP_PROPERTY_NOTIFY(CActiveDiathekeCtrl, "arshape", m_arshape, OnArshapeChanged, VT_BOOL)
 	DISP_PROPERTY_NOTIFY(CActiveDiathekeCtrl, "bidireorder", m_bidireorder, OnBidireorderChanged, VT_BOOL)
 	DISP_PROPERTY_NOTIFY(CActiveDiathekeCtrl, "outputencoding", m_outputencoding, OnOutputencodingChanged, VT_I2)
+	DISP_PROPERTY_NOTIFY(CActiveDiathekeCtrl, "range", m_range, OnRangeChanged, VT_BSTR)
 	DISP_FUNCTION(CActiveDiathekeCtrl, "query", query, VT_I4, VTS_NONE)
 	//}}AFX_DISPATCH_MAP
 END_DISPATCH_MAP()
@@ -271,14 +272,13 @@
 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, 
-          range,                   //lda
+          (LPCTSTR)m_range,
           (LPCTSTR)m_book, 
           (LPCTSTR)m_locale, 
           (LPCTSTR)m_key, 
@@ -393,6 +393,13 @@
 }
 
 void CActiveDiathekeCtrl::OnOutputencodingChanged() 
+{
+	if (m_autoupdate)
+		query();
+	SetModifiedFlag();
+}
+
+void CActiveDiathekeCtrl::OnRangeChanged() 
 {
 	if (m_autoupdate)
 		query();

Index: ActiveDiatheke.odl
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/vc/ActiveDiatheke/ActiveDiatheke.odl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ActiveDiatheke.odl	19 Mar 2002 08:12:53 -0000	1.4
+++ ActiveDiatheke.odl	22 Oct 2003 03:13:12 -0000	1.5
@@ -47,13 +47,14 @@
 			[id(19)] boolean arshape;
 			[id(20)] boolean bidireorder;
 			[id(21)] short outputencoding;
+			[id(22)] BSTR range;
 			//}}AFX_ODL_PROP
 
 		methods:
 			// NOTE - ClassWizard will maintain method information here.
 			//    Use extreme caution when editing this section.
 			//{{AFX_ODL_METHOD(CActiveDiathekeCtrl)
-			[id(22)] long query();
+			[id(23)] long query();
 			//}}AFX_ODL_METHOD
 	};