[sword-svn] r3556 - in branches/sword-1-8-x: . bindings/swig

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2017-12-23 16:43:05 -0700 (Sat, 23 Dec 2017)
New Revision: 3556

Modified:
   branches/sword-1-8-x/
   branches/sword-1-8-x/bindings/swig/deprecations.i
   branches/sword-1-8-x/bindings/swig/rendercallback.h
   branches/sword-1-8-x/bindings/swig/sword.i
Log:
Merging r3555 to 1-8-x



Property changes on: branches/sword-1-8-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538,3540,3545-3547,3551
   + /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538,3540,3545-3547,3551,3555

Modified: branches/sword-1-8-x/bindings/swig/deprecations.i
===================================================================
--- branches/sword-1-8-x/bindings/swig/deprecations.i	2017-12-23 23:37:19 UTC (rev 3555)
+++ branches/sword-1-8-x/bindings/swig/deprecations.i	2017-12-23 23:43:05 UTC (rev 3556)
@@ -14,6 +14,7 @@
 %ignore sword::SWDisplay::Display(SWModule&);
 
 %ignore sword::StatusReporter::statusUpdate(double ,double);
+%feature("nodirector") sword::StatusReporter::statusUpdate(double ,double);
 
 %ignore sword::SWKey::Error();
 %ignore sword::SWKey::Persist() const;

Modified: branches/sword-1-8-x/bindings/swig/rendercallback.h
===================================================================
--- branches/sword-1-8-x/bindings/swig/rendercallback.h	2017-12-23 23:37:19 UTC (rev 3555)
+++ branches/sword-1-8-x/bindings/swig/rendercallback.h	2017-12-23 23:43:05 UTC (rev 3556)
@@ -215,7 +215,7 @@
 	bool osisQToTick;
 	bool inBold;
 	bool inXRefNote;
-	bool BiblicalText;
+	bool isBiblicalText;
 	int suspendLevel;
 	SWBuf wordsOfChristStart;
 	SWBuf wordsOfChristEnd;
@@ -240,8 +240,8 @@
 {
 public:
 	SWBuf inscriptRef;
-	bool SecHead;
-	bool BiblicalText;
+	bool inSecHead;
+	bool isBiblicalText;
 	SWBuf version;
 	XMLTag startTag;	
 

Modified: branches/sword-1-8-x/bindings/swig/sword.i
===================================================================
--- branches/sword-1-8-x/bindings/swig/sword.i	2017-12-23 23:37:19 UTC (rev 3555)
+++ branches/sword-1-8-x/bindings/swig/sword.i	2017-12-23 23:43:05 UTC (rev 3556)
@@ -1,13 +1,13 @@
 #define SWDLLEXPORT  
 
+%include "deprecations.i"
+
 %module "Sword"
 %module(directors="1") Sword;
 
 /* Ignore warnings about Unknown base class */
 %warnfilter(401);
 
-%include "deprecations.i"
-
 #ifdef SWIGPYTHON
 %include "directors.i"
 #endif