From caba6ff484a20e8ddc2d4912f0edbbe9f926499c Mon Sep 17 00:00:00 2001 From: danglassey Date: Tue, 22 Oct 2002 13:01:49 +0000 Subject: sync with crosswire 20021022-1300 --- ChangeLog | 5 + apps/X11/InstallMgr/config.h | 233 +++++++++++++++-------- apps/X11/InstallMgr/config.h.in | 247 ++++++++++++++----------- apps/X11/InstallMgr/po/Makefile.in | 4 +- apps/X11/InstallMgr/po/POTFILES | 8 +- apps/X11/InstallMgr/src/MainFrm.h | 1 + apps/X11/VCL/Makefile.am | 2 +- apps/X11/VCL/TCustomTreeView.h | 4 +- apps/X11/VCL/property | 4 + apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm | 20 +- apps/windoze/CBuilder5/BibleCS/sword.bpr | 24 +-- apps/windoze/CBuilder5/BibleCS/sword.res | Bin 1972 -> 1972 bytes apps/windoze/CBuilder5/BibleCS/swordlib.bpr | 16 +- examples/cmdline/search.cpp | 10 +- include/listkey.h | 3 +- include/swversion.h | 4 +- src/keys/listkey.cpp | 22 ++- src/keys/swkey.cpp | 2 +- src/modules/comments/rawcom/rawcom.cpp | 3 +- src/modules/comments/zcom/zcom.cpp | 3 +- src/modules/texts/rawtext/rawtext.cpp | 3 +- src/modules/texts/ztext/ztext.cpp | 3 +- tests/modtest.cpp | 25 +-- 23 files changed, 386 insertions(+), 260 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05165af..7be9c8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ API ChangeLog (see the ChangeLog in each 'apps' directory for app specific changes +21-Oct-2002 Troy A. Griffitts + Fixed ListKey bugs dealing with TOP and BOTTOM and + added at least an attempt to position the + current element key on ListKey::setText + 20-Oct-2002 Troy A. Griffitts Added optimizations for ListKey persistent keys in VerseKey drivers diff --git a/apps/X11/InstallMgr/config.h b/apps/X11/InstallMgr/config.h index 0d16366..426a2fd 100644 --- a/apps/X11/InstallMgr/config.h +++ b/apps/X11/InstallMgr/config.h @@ -1,134 +1,213 @@ /* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated from configure.in by autoheader. */ +#define ENABLE_NLS 1 +/* #undef HAVE_CATGETS */ +#define HAVE_GETTEXT 1 +#define HAVE_LC_MESSAGES 1 +#define HAVE_STPCPY 1 +#define HAVE_LIBSM 1 +#define PACKAGE_LOCALE_DIR "/usr/local/share/locale" +/* #undef PACKAGE_DATA_DIR */ +/* #undef PACKAGE_SOURCE_DIR */ -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ #define HAVE_ALLOCA_H 1 -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +#define HAVE_ARGZ_H 1 -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define to 1 if you have the `dcgettext' function. */ +#define HAVE_DCGETTEXT 1 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* Define to 1 if you have the `feof_unlocked' function. */ +#define HAVE_FEOF_UNLOCKED 1 -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ +/* Define to 1 if you have the `fgets_unlocked' function. */ +#define HAVE_FGETS_UNLOCKED 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define to 1 if you have the `getegid' function. */ +#define HAVE_GETEGID 1 -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 -#define ENABLE_NLS 1 -/* #undef HAVE_CATGETS */ +/* Define to 1 if you have the `getgid' function. */ +#define HAVE_GETGID 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 + +/* Define to 1 if you have the `getuid' function. */ +#define HAVE_GETUID 1 + +/* Define if you have the iconv() function. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_INTTYPES_H */ + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define if your file defines LC_MESSAGES. */ #define HAVE_LC_MESSAGES 1 -#define HAVE_STPCPY 1 -#define HAVE_LIBSM 1 -#define PACKAGE_LOCALE_DIR "/usr/local/share/locale" -/* #undef PACKAGE_DATA_DIR */ -/* #undef PACKAGE_SOURCE_DIR */ -/* Define if you have the __argz_count function. */ -#define HAVE___ARGZ_COUNT 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 -/* Define if you have the __argz_next function. */ -#define HAVE___ARGZ_NEXT 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 -/* Define if you have the __argz_stringify function. */ -#define HAVE___ARGZ_STRINGIFY 1 +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 -/* Define if you have the dcgettext function. */ -#define HAVE_DCGETTEXT 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MEMORY_H */ -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 +/* Define to 1 if you have the `mempcpy' function. */ +#define HAVE_MEMPCPY 1 -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 -/* Define if you have the munmap function. */ +/* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ #define HAVE_STPCPY 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the strdup function. */ +/* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 -/* Define if you have the header file. */ -#define HAVE_X11_SM_SMLIB_H 1 - -/* Define if you have the header file. */ -#define HAVE_ARGZ_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STRINGS_H */ -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 -/* Define if you have the header file. */ -#define HAVE_MALLOC_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STAT_H */ -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TYPES_H */ -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define to 1 if you have the `tsearch' function. */ +#define HAVE_TSEARCH 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the i library (-li). */ -/* #undef HAVE_LIBI */ +/* Define to 1 if you have the header file. */ +#define HAVE_X11_SM_SMLIB_H 1 + +/* Define to 1 if you have the `__argz_count' function. */ +#define HAVE___ARGZ_COUNT 1 + +/* Define to 1 if you have the `__argz_next' function. */ +#define HAVE___ARGZ_NEXT 1 + +/* Define to 1 if you have the `__argz_stringify' function. */ +#define HAVE___ARGZ_STRINGIFY 1 + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST /* Name of package */ #define PACKAGE "installmgr" +/* Define to the address where bug reports for this package should be sent. */ +/* #undef PACKAGE_BUGREPORT */ + +/* Define to the full name of this package. */ +/* #undef PACKAGE_NAME */ + +/* Define to the full name and version of this package. */ +/* #undef PACKAGE_STRING */ + +/* Define to the one symbol short name of this package. */ +/* #undef PACKAGE_TARNAME */ + +/* Define to the version of this package. */ +/* #undef PACKAGE_VERSION */ + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + /* Version number of package */ #define VERSION "0.1" +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ + +/* Define to `long' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ diff --git a/apps/X11/InstallMgr/config.h.in b/apps/X11/InstallMgr/config.h.in index 9d9b1d1..b7c23fc 100644 --- a/apps/X11/InstallMgr/config.h.in +++ b/apps/X11/InstallMgr/config.h.in @@ -1,45 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - -/* Define if using alloca.c. */ -#undef C_ALLOCA - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -#undef CRAY_STACKSEG_END - -/* Define if you have alloca, as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define to `long' if doesn't define. */ -#undef off_t - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -#undef STACK_DIRECTION - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - +/* config.h.in. Generated from configure.in by autoheader. */ #undef ENABLE_NLS #undef HAVE_CATGETS #undef HAVE_GETTEXT @@ -50,130 +9,204 @@ #undef PACKAGE_DATA_DIR #undef PACKAGE_SOURCE_DIR -/* Define if you have the __argz_count function. */ -#undef HAVE___ARGZ_COUNT +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END -/* Define if you have the __argz_next function. */ -#undef HAVE___ARGZ_NEXT +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA -/* Define if you have the __argz_stringify function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARGZ_H -/* Define if you have the dcgettext function. */ +/* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT -/* Define if you have the feof_unlocked function. */ +/* Define to 1 if you have the `feof_unlocked' function. */ #undef HAVE_FEOF_UNLOCKED -/* Define if you have the fgets_unlocked function. */ +/* Define to 1 if you have the `fgets_unlocked' function. */ #undef HAVE_FGETS_UNLOCKED -/* Define if you have the getcwd function. */ +/* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define if you have the getegid function. */ +/* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID -/* Define if you have the geteuid function. */ +/* Define to 1 if you have the `geteuid' function. */ #undef HAVE_GETEUID -/* Define if you have the getgid function. */ +/* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID -/* Define if you have the getpagesize function. */ +/* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE -/* Define if you have the getuid function. */ +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID -/* Define if you have the mempcpy function. */ +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY -/* Define if you have the munmap function. */ +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_NL_TYPES_H + +/* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR -/* Define if you have the strdup function. */ +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the tsearch function. */ -#undef HAVE_TSEARCH +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H -/* Define if you have the header file. */ -#undef HAVE_X11_SM_SMLIB_H +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL -/* Define if you have the header file. */ -#undef HAVE_ARGZ_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ -#undef HAVE_LOCALE_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H +/* Define to 1 if you have the `tsearch' function. */ +#undef HAVE_TSEARCH -/* Define if you have the header file. */ -#undef HAVE_NL_TYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_SM_SMLIB_H -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT -/* Define if you have the header file. */ -#undef HAVE_STRING_H +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST /* Name of package */ #undef PACKAGE -/* Version number of package */ -#undef VERSION +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -/* Define to 1 if translation of program messages to the user's native language - is requested. */ -#undef ENABLE_NLS +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#undef inline + +/* Define to `long' if does not define. */ +#undef off_t + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/apps/X11/InstallMgr/po/Makefile.in b/apps/X11/InstallMgr/po/Makefile.in index fad13da..ffdf047 100644 --- a/apps/X11/InstallMgr/po/Makefile.in +++ b/apps/X11/InstallMgr/po/Makefile.in @@ -29,7 +29,7 @@ INSTALL_DATA = ${INSTALL} -m 644 MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs CC = gcc -GENCAT = +GENCAT = gencat GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt MSGFMT = /usr/bin/msgfmt XGETTEXT = PATH=../src:$$PATH /usr/bin/xgettext @@ -37,7 +37,7 @@ MSGMERGE = PATH=../src:$$PATH msgmerge DEFS = -DHAVE_CONFIG_H CFLAGS = -g -O2 -Wall -Wunused -CPPFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include +CPPFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include INCLUDES = -I.. -I$(top_srcdir)/intl diff --git a/apps/X11/InstallMgr/po/POTFILES b/apps/X11/InstallMgr/po/POTFILES index 3f9cfd2..cfed33e 100644 --- a/apps/X11/InstallMgr/po/POTFILES +++ b/apps/X11/InstallMgr/po/POTFILES @@ -1,4 +1,4 @@ - ../src/MainFrm.cpp \ - ../src/interface.c \ - ../src/callbacks.cpp \ - ../src/support.c + ../src/MainFrm.cpp \ + ../src/interface.c \ + ../src/callbacks.cpp \ + ../src/support.c diff --git a/apps/X11/InstallMgr/src/MainFrm.h b/apps/X11/InstallMgr/src/MainFrm.h index c7eefae..ff24ce8 100644 --- a/apps/X11/InstallMgr/src/MainFrm.h +++ b/apps/X11/InstallMgr/src/MainFrm.h @@ -30,6 +30,7 @@ #endif +using namespace sword; class VersionInfo { diff --git a/apps/X11/VCL/Makefile.am b/apps/X11/VCL/Makefile.am index 1a93246..2b60577 100644 --- a/apps/X11/VCL/Makefile.am +++ b/apps/X11/VCL/Makefile.am @@ -6,4 +6,4 @@ libVCL_a_SOURCES = TObject.cpp TPersistent.cpp TComponent.cpp \ TTreeView.cpp TCustomImageList.cpp TDragImageList.cpp \ TImageList.cpp -CPPFLAGS += `gtk-config --cflags` -static +AM_CPPFLAGS = `gtk-config --cflags` -static diff --git a/apps/X11/VCL/TCustomTreeView.h b/apps/X11/VCL/TCustomTreeView.h index 0b3c91d..a022326 100644 --- a/apps/X11/VCL/TCustomTreeView.h +++ b/apps/X11/VCL/TCustomTreeView.h @@ -36,8 +36,8 @@ class TTreeNodes; class TCustomTreeView : public TWinControl { -friend TTreeNodes; -friend TTreeNode; +friend class TTreeNodes; +friend class TTreeNode; protected: void init(TComponent *AOwner); diff --git a/apps/X11/VCL/property b/apps/X11/VCL/property index aee9eda..1c404bd 100644 --- a/apps/X11/VCL/property +++ b/apps/X11/VCL/property @@ -3,6 +3,10 @@ #include +using namespace std; +//using std:ostream; +//using std:istream; + template struct Property_index; template diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm index d8adede..514f36e 100644 --- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm +++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm @@ -4,7 +4,7 @@ object AboutBox: TAboutBox BorderStyle = bsDialog Caption = 'About The SWORD Project' ClientHeight = 448 - ClientWidth = 417 + ClientWidth = 447 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -45,7 +45,7 @@ object AboutBox: TAboutBox object Panel1: TPanel Left = 0 Top = 0 - Width = 417 + Width = 447 Height = 407 Align = alClient BevelInner = bvRaised @@ -102,24 +102,26 @@ object AboutBox: TAboutBox Width = 213 Height = 21 AutoSize = False - Caption = 'v1.5.4a' + Caption = 'v1.5.4b' IsControl = True end object Copyright: TLabel Left = 8 Top = 48 - Width = 398 + Width = 428 Height = 17 Anchors = [akLeft, akTop, akRight] AutoSize = False - Caption = '(c) 2002; GNU GPL Copyleft, CrossWire Bible Society' + Caption = + '(c) Copyright 1992-2002 CrossWire Bible Society under the terms ' + + 'of the GNU GPL' WordWrap = True IsControl = True end object CreditAbout: TRichEdit Left = 8 Top = 245 - Width = 401 + Width = 431 Height = 155 Anchors = [akLeft, akTop, akRight, akBottom] Color = clBtnFace @@ -130,7 +132,7 @@ object AboutBox: TAboutBox object ModulesAbout: TRichEdit Left = 8 Top = 68 - Width = 401 + Width = 431 Height = 169 Anchors = [akLeft, akTop, akRight] Color = clBtnFace @@ -142,12 +144,12 @@ object AboutBox: TAboutBox object Panel2: TPanel Left = 0 Top = 407 - Width = 417 + Width = 447 Height = 41 Align = alBottom TabOrder = 1 object OKButton: TButton - Left = 318 + Left = 348 Top = 8 Width = 93 Height = 25 diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index 120e95b..dda2df2 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -43,7 +43,7 @@ - + @@ -55,16 +55,16 @@ - - + + - - + + - + [Version Info] @@ -73,7 +73,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=5 Release=4 -Build=131 +Build=132 Debug=0 PreRelease=0 Special=0 @@ -85,13 +85,13 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project -FileVersion=1.5.4.131 +FileVersion=1.5.4.132 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License LegalTrademarks= OriginalFilename= ProductName=The SWORD Project -ProductVersion=1.5.4a +ProductVersion=1.5.4b Comments=Seek Him and you will find Him [HistoryLists\hlIncludePath] @@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=8 -Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item1=_ICU_;_ICUSWORD_;USBINARY +Item0=_ICU_;_ICUSWORD_;USBINARY +Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG Item4=_ICU_;_ICUSWORD_ @@ -159,7 +159,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res index 4c24f8a..e798be7 100644 Binary files a/apps/windoze/CBuilder5/BibleCS/sword.res and b/apps/windoze/CBuilder5/BibleCS/sword.res differ diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr index a280a48..9978ead 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr @@ -78,7 +78,7 @@ - + @@ -107,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"/> - - + + - + @@ -163,8 +163,8 @@ Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;.. [HistoryLists\hlConditionals] Count=8 -Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item1=_ICU_;_ICUSWORD_;USBINARY +Item0=_ICU_;_ICUSWORD_;USBINARY +Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG Item4=_ICU_;_ICUSWORD_ @@ -200,7 +200,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp index 34af335..2432e20 100644 --- a/examples/cmdline/search.cpp +++ b/examples/cmdline/search.cpp @@ -1,15 +1,12 @@ #include #include #include +#include #include // GNU #include #ifndef NO_SWORD_NAMESPACE -using sword::SWMgr; -using sword::SWModule; -using sword::ModMap; -using sword::VerseKey; -using sword::ListKey; +using namespace sword; #endif void percentUpdate(char percent, void *userData) { @@ -30,7 +27,8 @@ void percentUpdate(char percent, void *userData) { int main(int argc, char **argv) { - SWMgr manager; + SWMgr manager(0, 0, true, new MarkupFilterMgr(FMT_RTF, ENC_RTF)); +// SWMgr manager; SWModule *target; ListKey listkey; ListKey scope; diff --git a/include/listkey.h b/include/listkey.h index bd26e13..e5c2f62 100644 --- a/include/listkey.h +++ b/include/listkey.h @@ -4,7 +4,7 @@ * (e.g. verse, word, * place, etc.) * - * $Id: listkey.h,v 1.16 2002/10/01 19:52:40 dglassey Exp $ + * $Id: listkey.h,v 1.17 2002/10/21 22:48:24 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -114,6 +114,7 @@ public: */ virtual long Index (long index) { SetToElement (index); return Index (); } virtual const char *getText() const; + virtual void setText(const char *ikey); SWKEY_OPERATORS ListKey & operator =(const ListKey &key) { copyFrom(key); return *this; } diff --git a/include/swversion.h b/include/swversion.h index 09cf0fe..e2b1a23 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.8 2002/10/08 02:03:31 scribe Exp $ + * $Id: swversion.h,v 1.9 2002/10/22 01:28:49 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -20,7 +20,7 @@ */ #ifndef SWORDVER -#define SWORDVER "1.5.4a" +#define SWORDVER "1.5.5" #endif #ifndef SWVERSION_H diff --git a/src/keys/listkey.cpp b/src/keys/listkey.cpp index 557e36e..8f2876d 100644 --- a/src/keys/listkey.cpp +++ b/src/keys/listkey.cpp @@ -126,10 +126,10 @@ void ListKey::add(const SWKey &ikey) { void ListKey::setPosition(SW_POSITION p) { switch (p) { case 1: // GCC won't compile P_TOP - SetToElement(0); + SetToElement(0, p); break; case 2: // GCC won't compile P_BOTTOM - SetToElement(arraycnt-1); + SetToElement(arraycnt-1, p); break; } } @@ -152,7 +152,7 @@ void ListKey::increment(int step) { if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) { SetToElement(arraypos+1); } - else *this = (const char *)(*array[arraypos]); + else SWKey::setText((const char *)(*array[arraypos])); } else error = KEYERR_OUTOFBOUNDS; } @@ -176,7 +176,7 @@ void ListKey::decrement(int step) { if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) { SetToElement(arraypos-1, BOTTOM); } - else *this = (const char *)(*array[arraypos]); + else SWKey::setText((const char *)(*array[arraypos])); } else error = KEYERR_OUTOFBOUNDS; } @@ -219,9 +219,9 @@ char ListKey::SetToElement(int ielement, SW_POSITION pos) { if (arraycnt) { if (array[arraypos]->isBoundSet()) (*array[arraypos]) = pos; - *this = (const char *)(*array[arraypos]); + SWKey::setText((const char *)(*array[arraypos])); } - else *this = ""; + else SWKey::setText(""); return error; } @@ -290,5 +290,15 @@ const char *ListKey::getText() const { return (key) ? key->getText() : keytext; } + +void ListKey::setText(const char *ikey) { + // at least try to set the current element to this text + int pos = arraypos; + SWKey *key = (pos >= arraycnt) ? 0:array[pos]; + if (key) key->setText(ikey); + + SWKey::setText(ikey); +} + SWORD_NAMESPACE_END diff --git a/src/keys/swkey.cpp b/src/keys/swkey.cpp index 94f0908..d8da49e 100644 --- a/src/keys/swkey.cpp +++ b/src/keys/swkey.cpp @@ -38,7 +38,7 @@ SWKey::SWKey(SWKey const &k) keytext = 0; rangeText = 0; error = k.error; - stdstr(&keytext, k.keytext); + setText(k.getText()); init(); } diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp index c9cfcd5..75904eb 100644 --- a/src/modules/comments/rawcom/rawcom.cpp +++ b/src/modules/comments/rawcom/rawcom.cpp @@ -112,7 +112,8 @@ void RawCom::increment(int steps) { findoffset(tmpkey->Testament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry - && (start > 0) && (size)) // and we actually have a size +// && (start > 0) + && (size)) // and we actually have a size ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp index b3a10de..cb47e23 100644 --- a/src/modules/comments/zcom/zcom.cpp +++ b/src/modules/comments/zcom/zcom.cpp @@ -182,7 +182,8 @@ void zCom::increment(int steps) { findoffset(tmpkey->Testament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry - && (start > 0) && (size)) // and we actually have a size +// && (start > 0) + && (size)) // and we actually have a size ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp index ef7742a..1b1171a 100644 --- a/src/modules/texts/rawtext/rawtext.cpp +++ b/src/modules/texts/rawtext/rawtext.cpp @@ -542,7 +542,8 @@ void RawText::increment(int steps) { findoffset(tmpkey->Testament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry - && (start > 0) && (size)) // and we actually have a size +// && (start > 0) + && (size)) // and we actually have a size ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp index 00793c2..0867d8a 100644 --- a/src/modules/texts/ztext/ztext.cpp +++ b/src/modules/texts/ztext/ztext.cpp @@ -189,7 +189,8 @@ void zText::increment(int steps) { if ( (((laststart != start) || (lastsize != size)) // we're a different entry - && (start > 0) && (size)) // and we actually have a size +// && (start > 0) + && (size)) // and we actually have a size ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; diff --git a/tests/modtest.cpp b/tests/modtest.cpp index 37daabf..d3bd701 100644 --- a/tests/modtest.cpp +++ b/tests/modtest.cpp @@ -8,24 +8,13 @@ using namespace sword; int main(int argc, char **argv) { SWMgr mymgr; ModMap::iterator it; - SWModule *module; + SWModule *module = mymgr.Modules["RWP"]; + VerseKey parser; + ListKey lk = parser.ParseVerseList("mal4:6-rev", parser, true); + lk.Persist(1); + module->SetKey(lk); - for (it = mymgr.Modules.begin(); it != mymgr.Modules.end(); it++) { - module = it->second; - if (!strcmp(module->Type(), "Biblical Texts")) { - std::cout << module->Name() << "\n"; - for (*module = TOP; (!module->Key().Error()); ((VerseKey *)&module->Key())->Book(((VerseKey *)&module->Key())->Book()+1)) { - std::cout << module->KeyText() << "\n"; - } - } - - if (!strcmp(module->Type(), "Commentaries")) { - std::cout << module->Name() << "\n"; - for (*module = TOP; (!module->Error()); (*module)--) { - std::cout << module->KeyText() << "\n"; - } - - } - } + (*module) = TOP; + std::cout << module->KeyText() << "\n"; return 0; } -- cgit