diff options
| author | danglassey <danglassey> | 2002-10-03 13:01:30 +0000 |
|---|---|---|
| committer | danglassey <danglassey> | 2002-10-03 13:01:30 +0000 |
| commit | 7447953df080deacffa333680dad3f67b7c663be (patch) | |
| tree | 2e60c989e4955a1aa50d945da5d1464779464abc | |
| parent | bf167779c3051180f10188b1a988def048a8d232 (diff) | |
| download | sword-sf-cvs-7447953df080deacffa333680dad3f67b7c663be.tar.gz | |
sync with crosswire 20021003-1300
29 files changed, 111 insertions, 67 deletions
@@ -2,6 +2,9 @@ API ChangeLog (see the ChangeLog in each 'apps' directory for app specific changes 01-Oct-2002 Daniel Glassey <dglassey@crosswire.org> + work on sword swig perl binding + +01-Oct-2002 Daniel Glassey <dglassey@crosswire.org> change sword to use a sword namespace fix to build with gcc3.2 again after yesterday diff --git a/Makefile.am b/Makefile.am index 0526a43..18db613 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 # General defines -version := 1.5.4 +version := 1.5.5 # this WILL NOT WORK for you. only inhouse patched version of diff --git a/Makefile.in b/Makefile.in index 3ddfcc3..399d5c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,7 @@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 # General defines -version := 1.5.4 +version := 1.5.5 # this WILL NOT WORK for you. only inhouse patched version of diff --git a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp index 64f791e..db7e092 100644 --- a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp +++ b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp @@ -4,6 +4,9 @@ #pragma hdrstop #include "ModVisFrm.h" + +using namespace std; + //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma resource "*.dfm" diff --git a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h index d3fa99d..b65ab82 100644 --- a/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h +++ b/apps/windoze/CBuilder5/BibleCS/ModVisFrm.h @@ -13,6 +13,9 @@ #include <swconfig.h> #include <swmgr.h> #include <ComCtrls.hpp> + +using namespace sword; + //--------------------------------------------------------------------------- class TModVisForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h b/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h index e279783..bf6fe85 100644 --- a/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h +++ b/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h @@ -10,6 +10,9 @@ #include <Buttons.hpp> #include <ExtCtrls.hpp> #include <swconfig.h> + +using namespace sword; +using namespace std; //--------------------------------------------------------------------------- class TRangeMaintForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h index 8afb652..0d021a7 100644 --- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h +++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h @@ -10,6 +10,7 @@ #include <swmodule.h> #include <listkey.h> +using namespace sword; struct RTF_FORMAT { AnsiString fontFace; // Font Name diff --git a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp index b2e0ba5..54859d4 100644 --- a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp +++ b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp @@ -7,6 +7,7 @@ #include <utf8bidireorder.h> #include <utf8transliterator.h> #endif +using namespace std; //--------------------------------------------------------------------------- BibleCSMGR::BibleCSMGR(TModInstFrm *iModInstFrm) : SWMgr(0, 0, false, new MarkupFilterMgr(FMT_RTF, ENC_RTF)) { diff --git a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h index d9dbc97..5aa3950 100644 --- a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h +++ b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.h @@ -3,6 +3,9 @@ #define biblecsmgrH #include <swmgr.h> #include "ModInstForm.h" + +using namespace sword; + //--------------------------------------------------------------------------- enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE }; diff --git a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h index 41c606a..04a004e 100644 --- a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h +++ b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h @@ -10,6 +10,10 @@ #include <swconfig.h> #include <vcl\Menus.hpp> #include <list> + +using namespace sword; +using namespace std; + //--------------------------------------------------------------------------- class TbookmarkForm : public TForm { diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.h b/apps/windoze/CBuilder5/BibleCS/mainfrm.h index 0b2c342..04466a0 100644 --- a/apps/windoze/CBuilder5/BibleCS/mainfrm.h +++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.h @@ -53,6 +53,7 @@ #define MONITOR_WORKAREA 0x0002 // use monitor work area #define MONITOR_AREA 0x0000 // use monitor entire area +using namespace std; class RTFDisp : public SWDisplay { SWDispRTF *edit; diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index d801535..b9eb01f 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -43,7 +43,7 @@ <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="ilink32"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="sword.cpp"/> <INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/> @@ -55,16 +55,16 @@ <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/> - <CFLAG1 value="-O2 -Vx -Ve -RT- -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/> - <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -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"" -aa -Tpe -GD -s -Gn"/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/> </OPTIONS> <LINKER> <ALLOBJ value="c0w32.obj $(OBJFILES)"/> <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/> + <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/> </LINKER> <IDEOPTIONS> [Version Info] @@ -73,7 +73,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=5 Release=4 -Build=125 +Build=127 Debug=0 PreRelease=0 Special=0 @@ -85,7 +85,7 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project -FileVersion=1.5.4.125 +FileVersion=1.5.4.127 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License LegalTrademarks= @@ -124,14 +124,15 @@ Count=1 Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] -Count=7 -Item0=_ICU_;_ICUSWORD_;USBINARY -Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY -Item2=_ICU_;_ICUSWORD_;_DEBUG -Item3=_ICU_;_ICUSWORD_ -Item4=_ICU_ -Item5=_ICU_;_DEBUG -Item6=_DEBUG +Count=8 +Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item1=_ICU_;_ICUSWORD_;USBINARY +Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY +Item3=_ICU_;_ICUSWORD_;_DEBUG +Item4=_ICU_;_ICUSWORD_ +Item5=_ICU_ +Item6=_ICU_;_DEBUG +Item7=_DEBUG [HistoryLists\hlIntOutputDir] Count=2 @@ -158,11 +159,6 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= +LinkCGLIB=1 </IDEOPTIONS> </PROJECT>
\ No newline at end of file diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp index 13a52d3..277b859 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.cpp +++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp @@ -7,6 +7,8 @@ #include "sword.h" #include <thmlplain.h> +using namespace sword; + USERES("sword.res"); USEFORM("mainfrm.cpp", Form1); USEFORM("AboutBoxfrm.cpp", AboutBox); @@ -192,3 +194,5 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in + + diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res Binary files differindex 3e9ab0d..138d1ab 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.res +++ b/apps/windoze/CBuilder5/BibleCS/sword.res diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr index ece7bec..a280a48 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr @@ -40,12 +40,11 @@ ..\..\..\..\obj\crc32.obj ..\..\..\..\obj\adler32.obj ..\..\..\..\obj\gzio.obj ..\..\..\..\obj\untgz.obj ..\..\..\..\obj\unicodertf.obj ..\..\..\..\obj\gbfmorph.obj - ..\..\..\..\obj\thmlolb.obj ..\..\..\..\obj\roman.obj - ..\..\..\..\obj\gbfhtmlhref.obj ..\..\..\..\obj\latin1utf8.obj - ..\..\..\..\obj\latin1utf16.obj ..\..\..\..\obj\scsuutf8.obj - ..\..\..\..\obj\swbasicfilter.obj ..\..\..\..\obj\thmlhtmlhref.obj - ..\..\..\..\obj\utf8cantillation.obj ..\..\..\..\obj\utf8greekaccents.obj - ..\..\..\..\obj\utf8hebrewpoints.obj + ..\..\..\..\obj\thmlolb.obj ..\..\..\..\obj\gbfhtmlhref.obj + ..\..\..\..\obj\latin1utf8.obj ..\..\..\..\obj\latin1utf16.obj + ..\..\..\..\obj\scsuutf8.obj ..\..\..\..\obj\swbasicfilter.obj + ..\..\..\..\obj\thmlhtmlhref.obj ..\..\..\..\obj\utf8cantillation.obj + ..\..\..\..\obj\utf8greekaccents.obj ..\..\..\..\obj\utf8hebrewpoints.obj ..\..\..\..\obj\utf8transliterator.obj ..\..\..\..\obj\utf8utf16.obj ..\..\..\..\obj\utf16utf8.obj ..\..\..\..\obj\utf8latin1.obj ..\..\..\..\obj\utf8html.obj ..\..\..\..\obj\thmlscripref.obj @@ -62,7 +61,7 @@ ..\..\..\..\obj\thmlvariants.obj ..\..\..\..\obj\swcacher.obj ..\..\..\..\obj\greeklexattribs.obj ..\..\..\..\obj\gbfosis.obj ..\..\..\..\obj\thmlosis.obj ..\..\..\..\obj\installmgr.obj - ..\..\..\..\obj\ftpparse.obj"/> + ..\..\..\..\obj\ftpparse.obj ..\..\..\..\obj\roman.obj"/> <RESFILES value=""/> <IDLFILES value=""/> <IDLGENFILES value=""/> @@ -79,7 +78,7 @@ <DEBUGLIBPATH value=""/> <RELEASELIBPATH value=""/> <LINKER value="TLib"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL"/> <MAINSOURCE value="swordlib.cpp"/> <INCLUDEPATH value="..\InstallMgr\curl\include;..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/> @@ -108,11 +107,11 @@ -I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr -I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_DEBUG"/> - <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 - -4 -b- -k- -vi -c -g0 -tWM"/> - <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx + -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -g0 -tWM"/> + <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zn"/> + <AFLAGS value="/mx /w2 /zi"/> <LFLAGS value="/P512"/> </OPTIONS> <LINKER> @@ -163,14 +162,15 @@ Item4=..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys [HistoryLists\hlConditionals] -Count=7 -Item0=_ICU_;_ICUSWORD_;USBINARY -Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY -Item2=_ICU_;_ICUSWORD_;_DEBUG -Item3=_ICU_;_ICUSWORD_ -Item4=_ICU_ -Item5=_ICU_;_DEBUG -Item6=_DEBUG +Count=8 +Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item1=_ICU_;_ICUSWORD_;USBINARY +Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY +Item3=_ICU_;_ICUSWORD_;_DEBUG +Item4=_ICU_;_ICUSWORD_ +Item5=_ICU_ +Item6=_ICU_;_DEBUG +Item7=_DEBUG [HistoryLists\hlIntOutputDir] Count=2 @@ -200,7 +200,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=0 +LinkCGLIB=1 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.cpp b/apps/windoze/CBuilder5/BibleCS/swordlib.cpp index d0a8acc..4984417 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.cpp +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.cpp @@ -73,7 +73,6 @@ USEUNIT("..\..\..\..\src\utilfuns\zlib\untgz.c"); USEUNIT("..\..\..\..\src\modules\filters\unicodertf.cpp"); USEUNIT("..\..\..\..\src\modules\filters\gbfmorph.cpp"); USEUNIT("..\..\..\..\src\modules\filters\thmlolb.cpp"); -USEUNIT("..\..\..\..\src\utilfuns\roman.c"); USEUNIT("..\..\..\..\src\modules\filters\gbfhtmlhref.cpp"); USEUNIT("..\..\..\..\src\modules\filters\latin1utf8.cpp"); USEUNIT("..\..\..\..\src\modules\filters\latin1utf16.cpp"); @@ -116,6 +115,7 @@ USEUNIT("..\..\..\..\src\modules\filters\gbfosis.cpp"); USEUNIT("..\..\..\..\src\modules\filters\thmlosis.cpp"); USEUNIT("..\..\..\..\src\mgr\installmgr.cpp"); USEUNIT("..\..\..\..\src\utilfuns\ftpparse.c"); +USEUNIT("..\..\..\..\src\utilfuns\roman.cpp"); //--------------------------------------------------------------------------- #define Library diff --git a/apps/windoze/CBuilder5/BibleCS/versesel.cpp b/apps/windoze/CBuilder5/BibleCS/versesel.cpp index 8788580..0c87480 100644 --- a/apps/windoze/CBuilder5/BibleCS/versesel.cpp +++ b/apps/windoze/CBuilder5/BibleCS/versesel.cpp @@ -8,6 +8,9 @@ #pragma package(smart_init) #pragma resource "*.dfm" TVerseSelFrm *VerseSelFrm; + +using namespace sword; + //--------------------------------------------------------------------------- __fastcall TVerseSelFrm::TVerseSelFrm(TComponent* Owner) : TForm(Owner) diff --git a/apps/windoze/swdisprtfchap.cpp b/apps/windoze/swdisprtfchap.cpp index 9c7cb72..2d3b26e 100644 --- a/apps/windoze/swdisprtfchap.cpp +++ b/apps/windoze/swdisprtfchap.cpp @@ -6,6 +6,7 @@ #include "swdisprtfchap.h" #include <winbase.h> +using namespace std; //--------------------------------------------------------------------------- static inline SWDispRTFChap *ValidCtrCheck() diff --git a/apps/windoze/swwinlog.cpp b/apps/windoze/swwinlog.cpp index cf7d8e8..cc668ab 100644 --- a/apps/windoze/swwinlog.cpp +++ b/apps/windoze/swwinlog.cpp @@ -7,7 +7,10 @@ #include <conio.h> #include <stdarg.h> //--------------------------------------------------------------------------- - + + +SWORD_NAMESPACE_START + SWWinLog::SWWinLog(HWND iparent) : SWLog() { parent = iparent; } @@ -72,3 +75,5 @@ void SWWinLog::LogInformation(char *fmt, ...) MessageBox(NULL, msg, "Information", MB_OK); } } + +SWORD_NAMESPACE_END diff --git a/apps/windoze/tbdisp.cpp b/apps/windoze/tbdisp.cpp index 45de2bd..037543b 100644 --- a/apps/windoze/tbdisp.cpp +++ b/apps/windoze/tbdisp.cpp @@ -9,6 +9,7 @@ #include <windows.h> #include <string.h> +SWORD_NAMESPACE_START /****************************************************************************** * TBDisp Constructor - sets up an instance of TBDisp for use @@ -53,3 +54,5 @@ char TBDisp::Display(SWModule &imodule) delete [] buf; return 0; } + +SWORD_NAMESPACE_END diff --git a/bindings/swig/swconfig.i b/bindings/swig/swconfig.i index a934ffc..a53db71 100644 --- a/bindings/swig/swconfig.i +++ b/bindings/swig/swconfig.i @@ -6,6 +6,7 @@ #include <multimapwdef.h> #include "swconfig.h" +using namespace sword; %} %include "stl.i" diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i index 1ae1f8a..36aec5a 100644 --- a/bindings/swig/sword.i +++ b/bindings/swig/sword.i @@ -8,7 +8,7 @@ * @ref SWMgr, SWModule, SWKey, VerseKey and SWConfig. */ -%module sword +%module Sword %{ #undef bool #undef assert @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for sword 1.5.4. +# Generated by GNU Autoconf 2.53 for sword 1.5.5. # # Report bugs to <sword-bugs@crosswire.org>. # @@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='sword' PACKAGE_TARNAME='sword' -PACKAGE_VERSION='1.5.4' -PACKAGE_STRING='sword 1.5.4' +PACKAGE_VERSION='1.5.5' +PACKAGE_STRING='sword 1.5.5' PACKAGE_BUGREPORT='sword-bugs@crosswire.org' ac_unique_file="sword.bmp" @@ -930,7 +930,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sword 1.5.4 to adapt to many kinds of systems. +\`configure' configures sword 1.5.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -997,7 +997,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sword 1.5.4:";; + short | recursive ) echo "Configuration of sword 1.5.5:";; esac cat <<\_ACEOF @@ -1103,7 +1103,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -sword configure 1.5.4 +sword configure 1.5.5 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1118,7 +1118,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sword $as_me 1.5.4, which was +It was created by sword $as_me 1.5.5, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1736,7 +1736,7 @@ fi # Define the identity of the package. PACKAGE=sword - VERSION=1.5.4 + VERSION=1.5.5 cat >>confdefs.h <<_ACEOF @@ -9124,7 +9124,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by sword $as_me 1.5.4, which was +This file was extended by sword $as_me 1.5.5, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9186,7 +9186,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sword config.status 1.5.4 +sword config.status 1.5.5 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 63ce360..5fa92fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ # --------------------------------------------------------------------- # Initialisation # --------------------------------------------------------------------- -AC_INIT(sword, 1.5.4, sword-bugs@crosswire.org) +AC_INIT(sword, 1.5.5, sword-bugs@crosswire.org) AC_CONFIG_SRCDIR(sword.bmp) AC_PREREQ(2.52) -AC_REVISION($Revision: 1.13 $) +AC_REVISION($Revision: 1.14 $) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(sword,1.5.4) +AM_INIT_AUTOMAKE(sword,1.5.5) AM_CONFIG_HEADER(config.h) diff --git a/include/Makefile.am b/include/Makefile.am index bd4edce..564c3ae 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -112,6 +112,7 @@ pkginclude_HEADERS += $(swincludedir)/zconf.h pkginclude_HEADERS += $(swincludedir)/zipcomprs.h pkginclude_HEADERS += $(swincludedir)/zld.h pkginclude_HEADERS += $(swincludedir)/zlib.h +pkginclude_HEADERS += $(swincludedir)/zstr.h pkginclude_HEADERS += $(swincludedir)/ztext.h pkginclude_HEADERS += $(swincludedir)/zverse.h diff --git a/include/swversion.h b/include/swversion.h index 1eceb08..20f723d 100644 --- a/include/swversion.h +++ b/include/swversion.h @@ -1,7 +1,7 @@ /****************************************************************************** * swversion.h - definition of class SWVersion used to compare version info * - * $Id: swversion.h,v 1.6 2002/10/01 19:52:40 dglassey Exp $ + * $Id: swversion.h,v 1.7 2002/10/02 23:43:43 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -20,7 +20,7 @@ */ #ifndef SWORDVER -#define SWORDVER "1.5.4" +#define SWORDVER "1.5.5" #endif #ifndef SWVERSION_H diff --git a/include/swwinlog.h b/include/swwinlog.h index 579e37b..d897fe9 100644 --- a/include/swwinlog.h +++ b/include/swwinlog.h @@ -2,7 +2,7 @@ * swwinlog.h - definition of SWWinLog-- a derivitive of SWLog used to * handle logging in the MSWindows environment * - * $Id: swwinlog.h,v 1.2 2001/02/09 15:38:51 jansorg Exp $ + * $Id: swwinlog.h,v 1.3 2002/10/03 04:26:46 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -27,6 +27,8 @@ #include <swlog.h> +SWORD_NAMESPACE_START + class SWWinLog:public SWLog { HWND parent; @@ -38,5 +40,5 @@ public: virtual void LogInformation (char *fmt, ...); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/tbdisp.h b/include/tbdisp.h index 8064da5..4358e47 100644 --- a/include/tbdisp.h +++ b/include/tbdisp.h @@ -3,7 +3,7 @@ * MSWindows TextBox (or any other control that takes a * SetDialogItemText * - * $Id: tbdisp.h,v 1.2 2001/02/09 15:38:51 jansorg Exp $ + * $Id: tbdisp.h,v 1.3 2002/10/03 04:26:46 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,9 @@ #define TBDISP_H #include <windows.h> + +SWORD_NAMESPACE_START + class SWModule; class TBDisp:public SWDisplay @@ -36,4 +39,7 @@ public: TBDisp (HWND iwnd, int ictrlid); virtual char Display (SWModule & imodule); }; + +SWORD_NAMESPACE_END + #endif diff --git a/lib/Makefile.in b/lib/Makefile.in index ff10833..70c5b90 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -163,7 +163,7 @@ zlddir = $(top_srcdir)/src/modules/lexdict/zld bindingsdir = $(top_srcdir)/bindings swincludedir = $(top_srcdir)/include -pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h $(swincludedir)/GreekChars.h $(swincludedir)/canon.h $(swincludedir)/cipherfil.h $(swincludedir)/defs.h $(swincludedir)/echomod.h $(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h $(swincludedir)/femain.h $(swincludedir)/filemgr.h $(swincludedir)/flatapi.h $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h $(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfmorph.h $(swincludedir)/gbfplain.h $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h $(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h $(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h $(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h $(swincludedir)/rawgbf.h $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h $(swincludedir)/rawverse.h $(swincludedir)/regex.h $(swincludedir)/roman.h $(swincludedir)/rtfhtml.h $(swincludedir)/rwphtml.h $(swincludedir)/rwprtf.h $(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h $(swincludedir)/swcacher.h $(swincludedir)/swcipher.h $(swincludedir)/swcom.h $(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h $(swincludedir)/swdisp.h $(swincludedir)/swdisprtf.h $(swincludedir)/swdisprtfchap.h $(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h $(swincludedir)/swld.h $(swincludedir)/swlocale.h $(swincludedir)/swlog.h $(swincludedir)/swmacs.h $(swincludedir)/swmgr.h $(swincludedir)/swmodule.h $(swincludedir)/swobject.h $(swincludedir)/swtext.h $(swincludedir)/swunicod.h $(swincludedir)/swversion.h $(swincludedir)/swwinlog.h $(swincludedir)/sysdata.h $(swincludedir)/tbdisp.h $(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h $(swincludedir)/thmlolb.h $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h $(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h $(swincludedir)/unixstr.h $(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h $(swincludedir)/utf8cantillation.h $(swincludedir)/utf8greekaccents.h $(swincludedir)/utf8hebrewpoints.h $(swincludedir)/utf8html.h $(swincludedir)/utf8latin1.h $(swincludedir)/utf8utf16.h $(swincludedir)/utilconf.h $(swincludedir)/utilfuns.h $(swincludedir)/utilstr.h $(swincludedir)/versekey.h $(swincludedir)/zcom.h $(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h $(swincludedir)/zlib.h $(swincludedir)/ztext.h $(swincludedir)/zverse.h $(ICU_HEAD) $(REMOTE_HEAD) +pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h $(swincludedir)/GreekChars.h $(swincludedir)/canon.h $(swincludedir)/cipherfil.h $(swincludedir)/defs.h $(swincludedir)/echomod.h $(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h $(swincludedir)/femain.h $(swincludedir)/filemgr.h $(swincludedir)/flatapi.h $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h $(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfmorph.h $(swincludedir)/gbfplain.h $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h $(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h $(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h $(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h $(swincludedir)/rawgbf.h $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h $(swincludedir)/rawverse.h $(swincludedir)/regex.h $(swincludedir)/roman.h $(swincludedir)/rtfhtml.h $(swincludedir)/rwphtml.h $(swincludedir)/rwprtf.h $(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h $(swincludedir)/swcacher.h $(swincludedir)/swcipher.h $(swincludedir)/swcom.h $(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h $(swincludedir)/swdisp.h $(swincludedir)/swdisprtf.h $(swincludedir)/swdisprtfchap.h $(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h $(swincludedir)/swld.h $(swincludedir)/swlocale.h $(swincludedir)/swlog.h $(swincludedir)/swmacs.h $(swincludedir)/swmgr.h $(swincludedir)/swmodule.h $(swincludedir)/swobject.h $(swincludedir)/swtext.h $(swincludedir)/swunicod.h $(swincludedir)/swversion.h $(swincludedir)/swwinlog.h $(swincludedir)/sysdata.h $(swincludedir)/tbdisp.h $(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h $(swincludedir)/thmlolb.h $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h $(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h $(swincludedir)/unixstr.h $(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h $(swincludedir)/utf8cantillation.h $(swincludedir)/utf8greekaccents.h $(swincludedir)/utf8hebrewpoints.h $(swincludedir)/utf8html.h $(swincludedir)/utf8latin1.h $(swincludedir)/utf8utf16.h $(swincludedir)/utilconf.h $(swincludedir)/utilfuns.h $(swincludedir)/utilstr.h $(swincludedir)/versekey.h $(swincludedir)/zcom.h $(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h $(swincludedir)/zlib.h $(swincludedir)/zstr.h $(swincludedir)/ztext.h $(swincludedir)/zverse.h $(ICU_HEAD) $(REMOTE_HEAD) @ICU_TRUE@ICU_HEAD = $(swincludedir)/utf8arshaping.h $(swincludedir)/utf8bidireorder.h $(swincludedir)/utf8nfc.h $(swincludedir)/utf8nfkd.h $(swincludedir)/utf8transliterator.h @ICU_FALSE@ICU_HEAD = |