Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gwenhywfar for openSUSE:Factory checked in at 2022-02-13 00:15:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenhywfar (Old) and /work/SRC/openSUSE:Factory/.gwenhywfar.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenhywfar" Sun Feb 13 00:15:35 2022 rev:80 rq:953957 version:5.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gwenhywfar/gwenhywfar.changes 2021-12-13 20:51:17.964669582 +0100 +++ /work/SRC/openSUSE:Factory/.gwenhywfar.new.1956/gwenhywfar.changes 2022-02-13 00:16:16.876266761 +0100 @@ -1,0 +2,8 @@ +Fri Feb 11 12:14:39 UTC 2022 - Johannes Engel <[email protected]> + +- Update to 5.8.2 + + GUI support for keypress/keyrelease events + + Return Window handle under X11 + + Bugfixes + +------------------------------------------------------------------- Old: ---- gwenhywfar-5.7.4.tar.gz New: ---- gwenhywfar-5.8.2.tar.gz gwenhywfar-5.8.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenhywfar.spec ++++++ --- /var/tmp/diff_new_pack.Ji3YAd/_old 2022-02-13 00:16:17.380268188 +0100 +++ /var/tmp/diff_new_pack.Ji3YAd/_new 2022-02-13 00:16:17.384268199 +0100 @@ -1,7 +1,7 @@ # # spec file for package gwenhywfar # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,22 @@ %define libversion 79 %define devversion 5 -%define devrelease 5.7 +%define devrelease 5.8 # Beta does not mean "before release" but a release that is considered as beta: %define _version %{version} %define _name gwenhywfar -%define releasenumber 396 +%define releasenumber 411 +%define checksumreleasenumber 410 %bcond_with configure Name: gwenhywfar -Version: 5.7.4 +Version: 5.8.2 Release: 0 Summary: Multiplatform helper library for other libraries License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries URL: https://www.aquamaniac.de/rdm/projects/gwenhywfar Source: https://www.aquamaniac.de/rdm/attachments/download/%{releasenumber}/%{_name}-%{_version}.tar.gz +Source1: https://www.aquamaniac.de/rdm/attachments/download/%{checksumreleasenumber}/%{_name}-%{_version}.tar.gz.asc BuildRequires: doxygen BuildRequires: fdupes # For doc graphs @@ -45,10 +47,10 @@ BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) ++++++ gwenhywfar-5.7.4.tar.gz -> gwenhywfar-5.8.2.tar.gz ++++++ ++++ 8280 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/ChangeLog new/gwenhywfar-5.8.2/ChangeLog --- old/gwenhywfar-5.7.4/ChangeLog 2021-10-23 16:53:11.000000000 +0200 +++ new/gwenhywfar-5.8.2/ChangeLog 2022-01-13 22:14:20.000000000 +0100 @@ -1,4 +1,141 @@ ------------------------------------------------------------------ +2022-01-13 22:14:01 +0100 Martin Preuss +Prepared release 5.8.2 + +------------------------------------------------------------------ +2021-12-09 17:57:22 +0100 Martin Preuss +GUI: Fixed a bug in GWEN_Dialog_EmitSignalToAll2(). +Only report that a signal has been handled if any dialog reported it! +Otherwise the e.g. key events are ignored by widgets which leads to them +not being able to handle keypress and keyrelease events properly. + +------------------------------------------------------------------ +2021-12-31 01:04:31 +0100 Martin Preuss +Test_framework: Allow for use in C++. + +------------------------------------------------------------------ +2021-12-30 19:50:03 +0100 Thomas Baumgart +Add the i18n_libs where needed +This fixes the build problems encountered on the KDE CI system + +------------------------------------------------------------------ +2021-12-30 12:06:26 +0100 Martin Preuss +Merge branch 'rel-5.8.1' + +------------------------------------------------------------------ +2021-12-30 12:00:39 +0100 Martin Preuss +Prepared release 5.8.1 (special release for KMyMoney). + +------------------------------------------------------------------ +2021-12-29 18:18:09 +0100 Martin Preuss +Updated default GUIs to use (qt4 and gtk2 are outdated). + +------------------------------------------------------------------ +2021-12-29 18:03:13 +0100 Martin Preuss +Add @i18n_libs@ when building cttest in gcttool. + +------------------------------------------------------------------ +2021-12-29 18:02:35 +0100 Martin Preuss +Use macro AM_GNU_GETEXT. + +------------------------------------------------------------------ +2021-12-15 23:20:29 +0100 Martin Preuss +Prepared release 5.8.0 + +------------------------------------------------------------------ +2021-12-15 22:03:45 +0100 Martin Preuss +Prepared release 5.8.0. + +------------------------------------------------------------------ +2021-12-15 21:43:28 +0100 Martin Preuss +Increased verbosity. + +------------------------------------------------------------------ +2021-12-15 21:42:53 +0100 Martin Preuss +typemaker2: Fixed a bug (not setting pointers to NULL after free). + +------------------------------------------------------------------ +2021-12-02 13:39:04 +0100 Martin Preuss +GUI: Add dialog property GWEN_DialogProperty_WindowId. +This is a special property for X11 environments only, it returns the +X11 window handle id (not to be used in normal apps, but e.g. needed when +embedding a libvlc media player). + +Implemented this property in FOX16 gui. + +------------------------------------------------------------------ +2021-12-02 13:37:03 +0100 Martin Preuss +GUI: Fixed missing return value. + +------------------------------------------------------------------ +2021-12-02 13:25:27 +0100 Martin Preuss +GUI: Implement "GWEN_WIDGET_FLAGS_FRAME_*" flags for FOX16 frontend. + +------------------------------------------------------------------ +2021-12-02 13:25:02 +0100 Martin Preuss +GUI: Read widget flags "GWEN_WIDGET_FLAGS_FRAME_*". + +------------------------------------------------------------------ +2021-12-02 13:18:48 +0100 Martin Preuss +GUI: Added second dialog callback to allow for 2 arguments. +This is needed to convey keypress/keyrelease events. If a handler for the +new callback mechanism is set it will be used, otherwise the old type1 +handler will be called and the arguments ignored. + +Added functions: +- GWEN_Dialog_EmitSignal2() +- GWEN_Dialog_EmitSignalToAll2() +- GWEN_Dialog_SetSignalHandler2() + +Added widget flags (hints only): +- GWEN_WIDGET_FLAGS_FRAME_SUNKEN +- GWEN_WIDGET_FLAGS_FRAME_RAISED +- GWEN_WIDGET_FLAGS_FRAME_THICK +- GWEN_WIDGET_FLAGS_FRAME_GROOVE + +Added dialog events: +- GWEN_DialogEvent_TypeKeyPressed +- GWEN_DialogEvent_TypeKeyReleased + +------------------------------------------------------------------ +2021-11-25 00:46:30 +0100 Martin Preuss +Build: Changed order of libs. +Follow "gwenhywfar-5.7.4-typemaker2-Makefiles.patch" +from gnucash-on-windows. + +------------------------------------------------------------------ +2021-11-18 20:52:28 +0100 Christian Stimming +fix out-of-tree build + +------------------------------------------------------------------ +2021-11-14 14:20:54 +0100 Martin Preuss +Released 5.7.4. + +------------------------------------------------------------------ +2021-11-13 19:11:26 +0100 Martin Preuss +Prepared release 5.7.4. + +------------------------------------------------------------------ +2021-10-24 21:02:35 +0200 Martin Preuss +Typemaker2: Fixed a bug. + +------------------------------------------------------------------ +2021-10-24 21:02:20 +0200 Martin Preuss +Typemaker2: Fixed *_copy() function. + +------------------------------------------------------------------ +2021-10-23 18:25:10 +0200 Martin Preuss +Increased build version. + +------------------------------------------------------------------ +2021-10-23 18:25:00 +0200 Martin Preuss +Fixed a typo. + +------------------------------------------------------------------ +2021-10-23 18:24:54 +0200 Martin Preuss +Added test for environment variable. + +------------------------------------------------------------------ 2021-10-23 16:09:12 +0200 Martin Preuss Minor code simplifications. @@ -369,130 +506,3 @@ ------------------------------------------------------------------ 2021-05-06 21:36:25 +0200 Martin Preuss Added some ideas to TODO. - ------------------------------------------------------------------- -2021-05-06 17:28:02 +0200 Martin Preuss -gwenbuild: Check for "required" flag when checking dependencies. - ------------------------------------------------------------------- -2021-05-06 17:27:30 +0200 Martin Preuss -gwenbuild: Decreased verbosity. - ------------------------------------------------------------------- -2021-05-06 17:03:46 +0200 Martin Preuss -gwenbuild: Added template for convenience libraries. - ------------------------------------------------------------------- -2021-05-06 17:03:26 +0200 Martin Preuss -gwenbuild: Accept "<data>" also inside "<project>". - ------------------------------------------------------------------- -2021-05-01 13:48:26 +0200 Martin Preuss -gwenbuild: Fixed targt type staticLib. -Use a small helper script to create a non-flat ar lib. - ------------------------------------------------------------------- -2021-04-22 00:17:17 +0200 Martin Preuss -gwenbuild: Fixed linking against internal static libs. - ------------------------------------------------------------------- -2021-04-21 23:29:25 +0200 Martin Preuss -gwenbuild: More work on static libs. -Need to rebuild installable static libs because "ar Trc" creates flat -archives which only refer to included subfolders. We need to unpack and -repack such an archive for exports. - ------------------------------------------------------------------- -2021-04-21 23:13:29 +0200 Martin Preuss -gwenbuild: Read GenericBuilders only once. Add "--static" arg for setup. - ------------------------------------------------------------------- -2021-04-20 23:37:56 +0200 Martin Preuss -gwenbuild: Write context to file. -Will be used later to show some infos like defines used in folders etc. - ------------------------------------------------------------------- -2021-04-20 21:39:08 +0200 Martin Preuss -text: Improved error message. - ------------------------------------------------------------------- -2021-04-20 00:01:08 +0200 Martin Preuss -gwenbuild: Allow for "<extradist>" also inside <project>. -This allows to distribute README etc in the root folder where there is not -yet a target defined. - ------------------------------------------------------------------- -2021-04-19 23:49:32 +0200 Martin Preuss -gwenbuild: Added command to generate a package tarball. -Creates a folder and copies files markes as "DIST" into it. -Next step will be to create the tarball from it and delete the dist folder. - ------------------------------------------------------------------- -2021-04-19 19:13:54 +0200 Martin Preuss -gwenbuild: Add 0BUILD files to project file list. - ------------------------------------------------------------------- -2021-04-18 23:58:54 +0200 Martin Preuss -Released 5.7.0beta. - ------------------------------------------------------------------- -2021-04-18 21:30:50 +0200 Martin Preuss -gwenbuild: Also use ldflags. Use cflags/ldflags in tryCompile/tryLink. - ------------------------------------------------------------------- -2021-04-18 21:13:53 +0200 Martin Preuss -gwenbuild: More tweaking of builder definitions. -Crosscompiling for Windows works now using mingw. - ------------------------------------------------------------------- -2021-04-18 20:55:26 +0200 Martin Preuss -gwenbuild: Create different builders for different target systems. -Cross-compiling for Windows on Linux now creates binaries. - ------------------------------------------------------------------- -2021-04-18 00:40:55 +0200 Martin Preuss -gwenbuild: Updated README. - ------------------------------------------------------------------- -2021-04-18 00:36:16 +0200 Martin Preuss -gwenbuild: Use existing build command list instead of creating an returning new ones. -Also allow to differentiate between error adding dependencies and simply -empty dependency list (e.g. when requesting to build a file which is a -non-generated source file). - ------------------------------------------------------------------- -2021-04-18 00:17:20 +0200 Martin Preuss -gwenbuild: Fixed dependency tracking. - ------------------------------------------------------------------- -2021-04-18 00:15:27 +0200 Martin Preuss -PATH: Fixed some bugs in GWEN_Path_GetPathBetween(). - ------------------------------------------------------------------- -2021-04-17 16:50:14 +0200 Martin Preuss -gwenbuild: Improved <BuildFiles> code. -Can now also select matching files from the project file list. This will -be needed for gettext-related commands. - ------------------------------------------------------------------- -2021-04-17 13:04:31 +0200 Martin Preuss -SIO: Try to set "HOST:" header in HTTP session. - ------------------------------------------------------------------- -2021-04-17 01:07:31 +0200 Martin Preuss -gwenbuild: Fixed a bug in option parser. -Was not expanding variables. Now AqFinance can be completely compiled and -installed, and the installed version works! - ------------------------------------------------------------------- -2021-04-17 01:06:53 +0200 Martin Preuss -pathmanager: Increased verbosity. -This can be helpfull when checking for bad paths. - ------------------------------------------------------------------- -2021-04-17 00:07:35 +0200 Martin Preuss -gwenbuild: Removed no longer needed fields. - ------------------------------------------------------------------- -2021-04-17 00:07:18 +0200 Martin Preuss -gwenbuild: Added missing includes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/TODO new/gwenhywfar-5.8.2/TODO --- old/gwenhywfar-5.7.4/TODO 2021-10-01 23:17:02.000000000 +0200 +++ new/gwenhywfar-5.8.2/TODO 2021-12-15 23:19:23.000000000 +0100 @@ -1,4 +1,8 @@ +GUI dialogs: +- implement "keyPressed" and "keyReleased" events in GTK3 and QT5 frontends +- implement "frame*" widget flags in GTK3 and QT5 frontends + typemaker2: - add a field annotoations (e.g. "personal data") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/config.h.in new/gwenhywfar-5.8.2/config.h.in --- old/gwenhywfar-5.7.4/config.h.in 2021-11-13 19:12:43.000000000 +0100 +++ new/gwenhywfar-5.8.2/config.h.in 2022-01-13 22:13:12.000000000 +0100 @@ -30,6 +30,10 @@ /* whether local install is wanted */ #undef ENABLE_LOCAL_INSTALL +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + /* visibility */ #undef GCC_WITH_VISIBILITY_ATTRIBUTE @@ -93,6 +97,18 @@ /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + /* Define to 1 if you have the declaration of `sigprocmask', and to 0 if you don't. */ #undef HAVE_DECL_SIGPROCMASK @@ -122,6 +138,9 @@ /* Define to 1 if you have the `getpid' function. */ #undef HAVE_GETPID +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + /* whether I18N is available */ #undef HAVE_I18N @@ -146,9 +165,6 @@ /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -/* Define to 1 if you have the <libintl.h> header file. */ -#undef HAVE_LIBINTL_H - /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/configure.ac new/gwenhywfar-5.8.2/configure.ac --- old/gwenhywfar-5.7.4/configure.ac 2021-11-13 19:12:06.000000000 +0100 +++ new/gwenhywfar-5.8.2/configure.ac 2022-01-13 22:12:40.000000000 +0100 @@ -28,8 +28,8 @@ # versions # GWENHYWFAR_VERSION_MAJOR=5 -GWENHYWFAR_VERSION_MINOR=7 -GWENHYWFAR_VERSION_PATCHLEVEL=4 +GWENHYWFAR_VERSION_MINOR=8 +GWENHYWFAR_VERSION_PATCHLEVEL=2 GWENHYWFAR_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "cvs" GWENHYWFAR_VERSION_TAG="stable" @@ -40,9 +40,9 @@ # # SO version for Gwenhywfar # -GWENHYWFAR_SO_CURRENT="86" -GWENHYWFAR_SO_AGE="7" -GWENHYWFAR_SO_REVISION="4" +GWENHYWFAR_SO_CURRENT="87" +GWENHYWFAR_SO_AGE="8" +GWENHYWFAR_SO_REVISION="2" GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" @@ -498,7 +498,7 @@ # check data search dir # AC_MSG_CHECKING(data search dir) -AC_ARG_WITH(data-searchdir, [ --with-data-searchdir=DIR where to search for gwen's data files], +AC_ARG_WITH(data-searchdir, [ --with-data-searchdir=DIR where to search for data files], [gwenhywfar_data_searchdir="$withval"], [gwenhywfar_data_searchdir=""]) @@ -748,31 +748,44 @@ AM_CONDITIONAL(IF_MAKE_I18N_FILES, [test "$MAKE_I18N_FILES" = "yes"]) -# then check whether i18n support is to be compiled in -i18n_libs="" -HAVE_I18N="yes" -AC_CHECK_HEADERS([locale.h libintl.h], [], [HAVE_I18N="no"]) - -if test "$OS_TYPE" != "windows"; then - oldlibs="$LIBS" - LIBS="" - AC_SEARCH_LIBS(gettext, intl, [], [HAVE_I18N="no"]) - i18n_libs="$LIBS" - LIBS="$oldlibs" -else - if test "$HAVE_I18N" != "no"; then - i18n_libs="-lintl" - all_libraries="${all_libraries} -lintl" - fi -fi +## then check whether i18n support is to be compiled in +#i18n_libs="" +#HAVE_I18N="yes" +#AC_CHECK_HEADERS([locale.h libintl.h], [], [HAVE_I18N="no"]) + +#if test "$OS_TYPE" != "windows"; then +# oldlibs="$LIBS" +# LIBS="" +# AC_SEARCH_LIBS(libintl_bindtextdomain, intl, [], [HAVE_I18N="no"]) +# i18n_libs="$LIBS" +# LIBS="$oldlibs" +#else +# if test "$HAVE_I18N" != "no"; then +# i18n_libs="-lintl" +# all_libraries="${all_libraries} -lintl" +# fi +#fi +# +#if test "$HAVE_I18N" != "no"; then +# AC_DEFINE_UNQUOTED(HAVE_I18N, 1, [whether I18N is available]) +#fi +# +#AC_SUBST(HAVE_I18N) +#AC_SUBST(i18n_libs) + + + +AM_GNU_GETTEXT([external]) +i18n_libs="$LTLIBINTL" +all_libraries="${all_libraries} $LTLIBINTL" +HAVE_I18N="$USE_NLS" if test "$HAVE_I18N" != "no"; then AC_DEFINE_UNQUOTED(HAVE_I18N, 1, [whether I18N is available]) fi -AC_SUBST(HAVE_I18N) AC_SUBST(i18n_libs) - +AC_SUBST(HAVE_I18N) ###------------------------------------------------------------------------- @@ -837,7 +850,7 @@ AC_ARG_WITH(guis, [ --with-guis=list space separated list of GUI implementations (default:all)], [gwenhywfar_guis="$withval"], - [gwenhywfar_guis="qt4 gtk2"] + [gwenhywfar_guis="qt5 gtk3"] ) if test "$gwenhywfar_guis" = "none"; then gwenhywfar_guis="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/gui/fox16/fox16_gui_dialog.cpp new/gwenhywfar-5.8.2/gui/fox16/fox16_gui_dialog.cpp --- old/gwenhywfar-5.7.4/gui/fox16/fox16_gui_dialog.cpp 2017-08-07 21:02:10.000000000 +0200 +++ new/gwenhywfar-5.8.2/gui/fox16/fox16_gui_dialog.cpp 2021-12-15 23:19:23.000000000 +0100 @@ -531,6 +531,7 @@ case GWEN_DialogProperty_SortDirection: case GWEN_DialogProperty_Sort: case GWEN_DialogProperty_ToolTip: + case GWEN_DialogProperty_WindowId: case GWEN_DialogProperty_None: case GWEN_DialogProperty_Unknown: ; @@ -815,6 +816,9 @@ case GWEN_DialogProperty_Focus: return (f->hasFocus())?1:0; + case GWEN_DialogProperty_WindowId: + return f->id(); + case GWEN_DialogProperty_Title: case GWEN_DialogProperty_Value: case GWEN_DialogProperty_MinValue: @@ -1190,6 +1194,7 @@ case GWEN_DialogProperty_Sort: case GWEN_DialogProperty_Visibility: case GWEN_DialogProperty_ToolTip: + case GWEN_DialogProperty_WindowId: case GWEN_DialogProperty_None: case GWEN_DialogProperty_Unknown: break; @@ -1564,6 +1569,7 @@ case GWEN_DialogProperty_Sort: case GWEN_DialogProperty_Visibility: case GWEN_DialogProperty_ToolTip: + case GWEN_DialogProperty_WindowId: case GWEN_DialogProperty_None: case GWEN_DialogProperty_Unknown: break; @@ -1739,6 +1745,8 @@ long FOX16_GuiDialog::onSelKeyPress(FXObject *sender, FXSelector sel, void *ptr) { GWEN_WIDGET *w; + FXEvent* event=(FXEvent*)ptr; + int rv; w=GWEN_Dialog_FindWidgetByImplData(_dialog, FOX16_DIALOG_WIDGET_REAL, sender); if (w==NULL) { @@ -1753,7 +1761,7 @@ case GWEN_Widget_TypeDialog: /* catch ENTER key */ - if (((FXEvent*)ptr)->code==KEY_Return || ((FXEvent*)ptr)->code==KEY_KP_Enter) { + if (event->code==KEY_Return || event->code==KEY_KP_Enter) { return 1; } return 0; @@ -1781,7 +1789,9 @@ case GWEN_Widget_TypeHLine: case GWEN_Widget_TypeVLine: case GWEN_Widget_TypeTextBrowser: - ; + rv=GWEN_Dialog_EmitSignalToAll2(_dialog, GWEN_DialogEvent_TypeKeyPressed, "", event->code, NULL); + if (rv!=GWEN_DialogEvent_ResultNotHandled) + return 1; } return 0; @@ -1791,6 +1801,8 @@ long FOX16_GuiDialog::onSelKeyRelease(FXObject *sender, FXSelector sel, void *ptr) { GWEN_WIDGET *w; + FXEvent* event=(FXEvent*)ptr; + int rv; w=GWEN_Dialog_FindWidgetByImplData(_dialog, FOX16_DIALOG_WIDGET_REAL, sender); if (w==NULL) { @@ -1801,7 +1813,7 @@ switch(GWEN_Widget_GetType(w)) { case GWEN_Widget_TypeDialog: /* catch ENTER key */ - if (((FXEvent*)ptr)->code==KEY_Return || ((FXEvent*)ptr)->code==KEY_KP_Enter) { + if (event->code==KEY_Return || event->code==KEY_KP_Enter) { return 1; } return 0; @@ -1831,7 +1843,9 @@ case GWEN_Widget_TypeHLine: case GWEN_Widget_TypeVLine: case GWEN_Widget_TypeTextBrowser: - ; + rv=GWEN_Dialog_EmitSignalToAll2(_dialog, GWEN_DialogEvent_TypeKeyReleased, "", event->code, NULL); + if (rv!=GWEN_DialogEvent_ResultNotHandled) + return 1; } return 0; @@ -1961,6 +1975,14 @@ opts|=JUSTIFY_CENTER_X; if (flags & GWEN_WIDGET_FLAGS_JUSTIFY_CENTERY) opts|=JUSTIFY_CENTER_Y; + if (flags & GWEN_WIDGET_FLAGS_FRAME_SUNKEN) + opts|=FRAME_SUNKEN; + if (flags & GWEN_WIDGET_FLAGS_FRAME_RAISED) + opts|=FRAME_RAISED; + if (flags & GWEN_WIDGET_FLAGS_FRAME_THICK) + opts|=FRAME_THICK; + if (flags & GWEN_WIDGET_FLAGS_FRAME_GROOVE) + opts|=FRAME_GROOVE; /* create THIS widget */ switch(GWEN_Widget_GetType(w)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/gui/testdialogs/dlg_test.c new/gwenhywfar-5.8.2/gui/testdialogs/dlg_test.c --- old/gwenhywfar-5.7.4/gui/testdialogs/dlg_test.c 2017-08-07 21:02:20.000000000 +0200 +++ new/gwenhywfar-5.8.2/gui/testdialogs/dlg_test.c 2021-12-15 23:19:23.000000000 +0100 @@ -254,6 +254,12 @@ case GWEN_DialogEvent_TypeLast: fprintf(stderr, "Last, ignored\n"); return GWEN_DialogEvent_ResultNotHandled; + + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: + fprintf(stderr, "Key events ignored\n"); + return GWEN_DialogEvent_ResultNotHandled; + } return GWEN_DialogEvent_ResultHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/gui/testdialogs/dlg_test2.c new/gwenhywfar-5.8.2/gui/testdialogs/dlg_test2.c --- old/gwenhywfar-5.7.4/gui/testdialogs/dlg_test2.c 2017-08-07 21:02:20.000000000 +0200 +++ new/gwenhywfar-5.8.2/gui/testdialogs/dlg_test2.c 2021-12-15 23:19:23.000000000 +0100 @@ -81,6 +81,10 @@ case GWEN_DialogEvent_TypeLast: fprintf(stderr, "Last, ignored\n"); return GWEN_DialogEvent_ResultNotHandled; + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: + fprintf(stderr, "Key events ignored\n"); + return GWEN_DialogEvent_ResultNotHandled; } return GWEN_DialogEvent_ResultHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/gwenhywfar.spec new/gwenhywfar-5.8.2/gwenhywfar.spec --- old/gwenhywfar-5.7.4/gwenhywfar.spec 2021-11-13 19:12:30.000000000 +0100 +++ new/gwenhywfar-5.8.2/gwenhywfar.spec 2022-01-13 22:13:04.000000000 +0100 @@ -3,7 +3,7 @@ %define name gwenhywfar -%define version 5.7.4 +%define version 5.8.2 %define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\" %define rpm_cflags \"-O2 -march=i486 -mcpu=i586\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/plugins/dbio/csv/csv.c new/gwenhywfar-5.8.2/plugins/dbio/csv/csv.c --- old/gwenhywfar-5.7.4/plugins/dbio/csv/csv.c 2021-10-17 15:19:17.000000000 +0200 +++ new/gwenhywfar-5.8.2/plugins/dbio/csv/csv.c 2021-12-15 23:19:23.000000000 +0100 @@ -429,6 +429,9 @@ GWEN_DB_AddGroup(data, n); /* add data */ GWEN_StringList_free(sl); } + else { + DBG_INFO(GWEN_LOGDOMAIN, "Line contains no strings"); + } } /* if this is not the title line */ lines++; } /* for */ @@ -611,6 +614,7 @@ +/* only used by _csvCheckFile(), not for actual import! */ int _readCsvLine(GWEN_FAST_BUFFER *fb, GWEN_STRINGLIST *sl) { int err; @@ -643,11 +647,13 @@ GWEN_TEXT_FLAGS_NULL_IS_DELIMITER | GWEN_TEXT_FLAGS_DEL_QUOTES, &s); - if (rv) { + if (rv<0) { + DBG_INFO(GWEN_LOGDOMAIN, "here (%d)", rv); GWEN_Buffer_free(wbuffer); GWEN_Buffer_free(lbuffer); return rv; } + GWEN_StringList_AppendString(sl, GWEN_Buffer_GetStart(wbuffer), 0, 0); GWEN_Buffer_Reset(wbuffer); if (*s) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/base/stringlist.c new/gwenhywfar-5.8.2/src/base/stringlist.c --- old/gwenhywfar-5.7.4/src/base/stringlist.c 2021-09-10 16:31:02.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/base/stringlist.c 2021-12-15 23:19:23.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** begin : Thu Apr 03 2003 - copyright : (C) 2003 by Martin Preuss + copyright : (C) 2021 by Martin Preuss email : [email protected] *************************************************************************** @@ -817,6 +817,7 @@ if (!(*s)) break; + DBG_VERBOUS(GWEN_LOGDOMAIN, "Reading word from here: [%s] (delimiters: [%s])", s, delimiters); if (GWEN_Text_GetWordToBuffer(s, delimiters, wbuf, flags, &s)) break; @@ -908,3 +909,5 @@ } } + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dialog.c new/gwenhywfar-5.8.2/src/gui/dialog.c --- old/gwenhywfar-5.7.4/src/gui/dialog.c 2019-09-17 17:53:15.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/gui/dialog.c 2022-01-13 22:08:02.000000000 +0100 @@ -321,10 +321,48 @@ GWEN_DIALOG_EVENTTYPE t, const char *sender) { + return GWEN_Dialog_EmitSignal2(dlg, t, sender, -1, NULL); +} + + + +int GWEN_Dialog_EmitSignalToAll(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender) +{ + return GWEN_Dialog_EmitSignalToAll2(dlg, t, sender, -1, NULL); +} + + + +GWEN_DIALOG_SIGNALHANDLER2 GWEN_Dialog_SetSignalHandler2(GWEN_DIALOG *dlg, + GWEN_DIALOG_SIGNALHANDLER2 fn) +{ + GWEN_DIALOG_SIGNALHANDLER2 oh; + + assert(dlg); + assert(dlg->refCount); + + oh=dlg->signalHandler2; + dlg->signalHandler2=fn; + + return oh; +} + + + +int GWEN_Dialog_EmitSignal2(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender, + int intArg, + const char *stringArg) +{ assert(dlg); assert(dlg->refCount); - if (dlg->signalHandler) + if (dlg->signalHandler2) + return (dlg->signalHandler2)(dlg, t, sender, intArg, stringArg); + else if (dlg->signalHandler) return (dlg->signalHandler)(dlg, t, sender); else { DBG_WARN(GWEN_LOGDOMAIN, "No signal handler in dialog [%s]", @@ -335,33 +373,51 @@ -int GWEN_Dialog_EmitSignalToAll(GWEN_DIALOG *dlg, - GWEN_DIALOG_EVENTTYPE t, - const char *sender) +int GWEN_Dialog_EmitSignalToAll2(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender, + int intArg, + const char *stringArg) { int rv; GWEN_DIALOG *subdlg; + int anyDialogHasHandledThisSignal=0; assert(dlg); assert(dlg->refCount); subdlg=GWEN_Dialog_List_First(dlg->subDialogs); while (subdlg) { - rv=GWEN_Dialog_EmitSignalToAll(subdlg, t, sender); + rv=GWEN_Dialog_EmitSignalToAll2(subdlg, t, sender, intArg, stringArg); + if (rv==GWEN_DialogEvent_ResultHandled) + anyDialogHasHandledThisSignal=1; if (rv!=GWEN_DialogEvent_ResultHandled && rv!=GWEN_DialogEvent_ResultNotHandled) return rv; subdlg=GWEN_Dialog_List_Next(subdlg); } - if (dlg->signalHandler) { - rv=(dlg->signalHandler)(dlg, t, sender); + if (dlg->signalHandler2) { + rv=(dlg->signalHandler2)(dlg, t, sender, intArg, stringArg); + if (rv==GWEN_DialogEvent_ResultHandled) + anyDialogHasHandledThisSignal=1; if (rv!=GWEN_DialogEvent_ResultHandled && rv!=GWEN_DialogEvent_ResultNotHandled) return rv; } + else if (dlg->signalHandler) { + rv=(dlg->signalHandler)(dlg, t, sender); + if (rv==GWEN_DialogEvent_ResultHandled) + anyDialogHasHandledThisSignal=1; + if (rv!=GWEN_DialogEvent_ResultHandled && + rv!=GWEN_DialogEvent_ResultNotHandled) + return rv; + } - return GWEN_DialogEvent_ResultHandled; + if (anyDialogHasHandledThisSignal) + return GWEN_DialogEvent_ResultHandled; + else + return GWEN_DialogEvent_ResultNotHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dialog.h new/gwenhywfar-5.8.2/src/gui/dialog.h --- old/gwenhywfar-5.7.4/src/gui/dialog.h 2019-09-17 17:53:15.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/gui/dialog.h 2021-12-15 23:19:23.000000000 +0100 @@ -57,33 +57,41 @@ GWEN_LIST2_FUNCTION_LIB_DEFS(GWEN_DIALOG, GWEN_Dialog, GWENHYWFAR_API) -#define GWEN_WIDGET_FLAGS_NONE 0x00000000L -#define GWEN_WIDGET_FLAGS_FILLX 0x80000000L -#define GWEN_WIDGET_FLAGS_FILLY 0x40000000L -#define GWEN_WIDGET_FLAGS_READONLY 0x20000000L -#define GWEN_WIDGET_FLAGS_PASSWORD 0x10000000L -#define GWEN_WIDGET_FLAGS_DEFAULT_WIDGET 0x08000000L - -#define GWEN_WIDGET_FLAGS_DECOR_SHRINKABLE 0x04000000L -#define GWEN_WIDGET_FLAGS_DECOR_STRETCHABLE 0x02000000L -#define GWEN_WIDGET_FLAGS_DECOR_MINIMIZE 0x01000000L -#define GWEN_WIDGET_FLAGS_DECOR_MAXIMIZE 0x00800000L -#define GWEN_WIDGET_FLAGS_DECOR_CLOSE 0x00400000L -#define GWEN_WIDGET_FLAGS_DECOR_MENU 0x00200000L - -#define GWEN_WIDGET_FLAGS_FIXED_WIDTH 0x00100000L -#define GWEN_WIDGET_FLAGS_FIXED_HEIGHT 0x00080000L -#define GWEN_WIDGET_FLAGS_EQUAL_WIDTH 0x00040000L -#define GWEN_WIDGET_FLAGS_EQUAL_HEIGHT 0x00020000L - -#define GWEN_WIDGET_FLAGS_JUSTIFY_LEFT 0x00010000L -#define GWEN_WIDGET_FLAGS_JUSTIFY_RIGHT 0x00008000L -#define GWEN_WIDGET_FLAGS_JUSTIFY_TOP 0x00004000L -#define GWEN_WIDGET_FLAGS_JUSTIFY_BOTTOM 0x00002000L -#define GWEN_WIDGET_FLAGS_JUSTIFY_CENTERX 0x00001000L -#define GWEN_WIDGET_FLAGS_JUSTIFY_CENTERY 0x00000800L +#define GWEN_WIDGET_FLAGS_NONE 0x00000000L +#define GWEN_WIDGET_FLAGS_FILLX 0x80000000L +#define GWEN_WIDGET_FLAGS_FILLY 0x40000000L +#define GWEN_WIDGET_FLAGS_READONLY 0x20000000L +#define GWEN_WIDGET_FLAGS_PASSWORD 0x10000000L +#define GWEN_WIDGET_FLAGS_DEFAULT_WIDGET 0x08000000L + +#define GWEN_WIDGET_FLAGS_DECOR_SHRINKABLE 0x04000000L +#define GWEN_WIDGET_FLAGS_DECOR_STRETCHABLE 0x02000000L +#define GWEN_WIDGET_FLAGS_DECOR_MINIMIZE 0x01000000L +#define GWEN_WIDGET_FLAGS_DECOR_MAXIMIZE 0x00800000L +#define GWEN_WIDGET_FLAGS_DECOR_CLOSE 0x00400000L +#define GWEN_WIDGET_FLAGS_DECOR_MENU 0x00200000L + +#define GWEN_WIDGET_FLAGS_FIXED_WIDTH 0x00100000L +#define GWEN_WIDGET_FLAGS_FIXED_HEIGHT 0x00080000L +#define GWEN_WIDGET_FLAGS_EQUAL_WIDTH 0x00040000L +#define GWEN_WIDGET_FLAGS_EQUAL_HEIGHT 0x00020000L + +#define GWEN_WIDGET_FLAGS_JUSTIFY_LEFT 0x00010000L +#define GWEN_WIDGET_FLAGS_JUSTIFY_RIGHT 0x00008000L +#define GWEN_WIDGET_FLAGS_JUSTIFY_TOP 0x00004000L +#define GWEN_WIDGET_FLAGS_JUSTIFY_BOTTOM 0x00002000L +#define GWEN_WIDGET_FLAGS_JUSTIFY_CENTERX 0x00001000L +#define GWEN_WIDGET_FLAGS_JUSTIFY_CENTERY 0x00000800L + +#define GWEN_WIDGET_FLAGS_NO_WORDWRAP 0x00000400L + +#define GWEN_WIDGET_FLAGS_HANDLE_KEYS 0x00000200L + +#define GWEN_WIDGET_FLAGS_FRAME_SUNKEN 0x00000100L +#define GWEN_WIDGET_FLAGS_FRAME_RAISED 0x00000080L +#define GWEN_WIDGET_FLAGS_FRAME_THICK 0x00000040L +#define GWEN_WIDGET_FLAGS_FRAME_GROOVE 0x00000020L -#define GWEN_WIDGET_FLAGS_NO_WORDWRAP 0x00000400L @@ -95,6 +103,8 @@ GWEN_DialogEvent_TypeEnabled, GWEN_DialogEvent_TypeDisabled, GWEN_DialogEvent_TypeClose, + GWEN_DialogEvent_TypeKeyPressed, + GWEN_DialogEvent_TypeKeyReleased, GWEN_DialogEvent_TypeLast } GWEN_DIALOG_EVENTTYPE; @@ -123,6 +133,16 @@ GWEN_DIALOG_EVENTTYPE t, const char *sender); +/** + * New signal handler definition. This one allows conveying arguments. + * The meaning of the arguments depends on the signal. + */ +typedef int GWENHYWFAR_CB(*GWEN_DIALOG_SIGNALHANDLER2)(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender, + int intArg, + const char *stringArg); + GWENHYWFAR_API @@ -226,6 +246,14 @@ GWEN_DIALOG_SIGNALHANDLER fn); +/** + * Sets the new signal handler of the dialog. Please note that this doesn't set the signal + * handler of any sub-dialog, so each dialog will only receive its own signals. + */ +GWENHYWFAR_API +GWEN_DIALOG_SIGNALHANDLER2 GWEN_Dialog_SetSignalHandler2(GWEN_DIALOG *dlg, GWEN_DIALOG_SIGNALHANDLER2 fn); + + @@ -252,6 +280,8 @@ GWEN_DialogProperty_Visibility, GWEN_DialogProperty_ToolTip, + GWEN_DialogProperty_WindowId, + GWEN_DialogProperty_Unknown=-1 } GWEN_DIALOG_PROPERTY; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dialog_be.h new/gwenhywfar-5.8.2/src/gui/dialog_be.h --- old/gwenhywfar-5.7.4/src/gui/dialog_be.h 2017-08-07 21:02:21.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/gui/dialog_be.h 2021-12-15 23:19:23.000000000 +0100 @@ -124,6 +124,21 @@ GWENHYWFAR_API +int GWEN_Dialog_EmitSignal2(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender, + int intArg, + const char *stringArg); + +GWENHYWFAR_API +int GWEN_Dialog_EmitSignalToAll2(GWEN_DIALOG *dlg, + GWEN_DIALOG_EVENTTYPE t, + const char *sender, + int intArg, + const char *stringArg); + + +GWENHYWFAR_API GWEN_DIALOG *GWEN_Dialog_GetParentDialog(const GWEN_DIALOG *dlg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dialog_p.h new/gwenhywfar-5.8.2/src/gui/dialog_p.h --- old/gwenhywfar-5.7.4/src/gui/dialog_p.h 2017-08-07 21:02:11.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/gui/dialog_p.h 2021-12-15 23:19:23.000000000 +0100 @@ -39,6 +39,7 @@ GWEN_WIDGET_TREE *widgets; GWEN_DIALOG_SIGNALHANDLER signalHandler; + GWEN_DIALOG_SIGNALHANDLER2 signalHandler2; GWEN_DIALOG_SETINTPROPERTY_FN setIntPropertyFn; GWEN_DIALOG_GETINTPROPERTY_FN getIntPropertyFn; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dlg_input.c new/gwenhywfar-5.8.2/src/gui/dlg_input.c --- old/gwenhywfar-5.7.4/src/gui/dlg_input.c 2020-01-11 16:20:12.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/gui/dlg_input.c 2021-12-15 23:19:23.000000000 +0100 @@ -360,6 +360,8 @@ case GWEN_DialogEvent_TypeClose: return GWEN_DialogEvent_ResultAccept; + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: case GWEN_DialogEvent_TypeLast: return GWEN_DialogEvent_ResultNotHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dlg_message.c new/gwenhywfar-5.8.2/src/gui/dlg_message.c --- old/gwenhywfar-5.7.4/src/gui/dlg_message.c 2020-01-11 16:20:16.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/gui/dlg_message.c 2021-12-15 23:19:23.000000000 +0100 @@ -251,6 +251,8 @@ case GWEN_DialogEvent_TypeClose: return GWEN_DialogEvent_ResultAccept; + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: case GWEN_DialogEvent_TypeLast: return GWEN_DialogEvent_ResultNotHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dlg_progress.c new/gwenhywfar-5.8.2/src/gui/dlg_progress.c --- old/gwenhywfar-5.7.4/src/gui/dlg_progress.c 2020-01-11 16:20:05.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/gui/dlg_progress.c 2021-12-15 23:19:23.000000000 +0100 @@ -563,6 +563,8 @@ else return GWEN_DialogEvent_ResultAccept; + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: case GWEN_DialogEvent_TypeLast: return GWEN_DialogEvent_ResultNotHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/dlg_showbox.c new/gwenhywfar-5.8.2/src/gui/dlg_showbox.c --- old/gwenhywfar-5.7.4/src/gui/dlg_showbox.c 2020-01-11 16:20:30.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/gui/dlg_showbox.c 2021-12-15 23:19:23.000000000 +0100 @@ -197,6 +197,8 @@ case GWEN_DialogEvent_TypeClose: return GWEN_DialogEvent_ResultAccept; + case GWEN_DialogEvent_TypeKeyPressed: + case GWEN_DialogEvent_TypeKeyReleased: case GWEN_DialogEvent_TypeLast: return GWEN_DialogEvent_ResultNotHandled; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/gui/widget.c new/gwenhywfar-5.8.2/src/gui/widget.c --- old/gwenhywfar-5.7.4/src/gui/widget.c 2019-09-25 16:03:19.000000000 +0200 +++ new/gwenhywfar-5.8.2/src/gui/widget.c 2021-12-15 23:19:23.000000000 +0100 @@ -583,6 +583,14 @@ fl|=GWEN_WIDGET_FLAGS_JUSTIFY_CENTERY; else if (strcasecmp(wstart, "noWordWrap")==0) fl|=GWEN_WIDGET_FLAGS_NO_WORDWRAP; + else if (strcasecmp(wstart, "frameSunken")==0) + fl|=GWEN_WIDGET_FLAGS_FRAME_SUNKEN; + else if (strcasecmp(wstart, "frameRaised")==0) + fl|=GWEN_WIDGET_FLAGS_FRAME_RAISED; + else if (strcasecmp(wstart, "frameThick")==0) + fl|=GWEN_WIDGET_FLAGS_FRAME_THICK; + else if (strcasecmp(wstart, "frameGroove")==0) + fl|=GWEN_WIDGET_FLAGS_FRAME_GROOVE; } if (copy) free(copy); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/ressource.rc new/gwenhywfar-5.8.2/src/ressource.rc --- old/gwenhywfar-5.7.4/src/ressource.rc 2021-11-13 19:12:30.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/ressource.rc 2022-01-13 22:13:04.000000000 +0100 @@ -43,8 +43,8 @@ // Version VS_VERSION_INFO VERSIONINFO - FILEVERSION 5, 7, 4, 0 - PRODUCTVERSION 5, 7, 4, 0 + FILEVERSION 5, 8, 2, 0 + PRODUCTVERSION 5, 8, 2, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L // Windows NT @@ -58,14 +58,14 @@ //VALUE "Comments", "\0" VALUE "CompanyName", " Aquamaniac\0" VALUE "FileDescription", "Multi purpose library\0" - VALUE "FileVersion", "v5.7.4\0" + VALUE "FileVersion", "v5.8.2\0" VALUE "InternalName", "Gwenhywfar\0" VALUE "LegalCopyright", "Copyright ? 2003 by Martin Preuss\0" VALUE "LegalTrademarks", "Aquamaniac\0" VALUE "OriginalFilename", "GWENHYWFAR32.DLL\0" //VALUE "PrivateBuild", "\0" VALUE "ProductName", "Gwenhywfar\0" - VALUE "ProductVersion", "v5.7.4stable-0\0" + VALUE "ProductVersion", "v5.8.2stable-0\0" VALUE "Author", "Martin Preuss\0" VALUE "Email", "[email protected]\0" VALUE "Homepage", "http://gwenhywfar.sf.net/\0"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/test_framework/testframework.h new/gwenhywfar-5.8.2/src/test_framework/testframework.h --- old/gwenhywfar-5.7.4/src/test_framework/testframework.h 2020-01-09 21:55:25.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/test_framework/testframework.h 2021-12-31 01:02:08.000000000 +0100 @@ -15,6 +15,10 @@ #include <gwenhywfar/testmodule.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef struct GWEN_TEST_FRAMEWORK GWEN_TEST_FRAMEWORK; @@ -31,6 +35,11 @@ GWENHYWFAR_API void TestFramework_free(GWEN_TEST_FRAMEWORK *tf); +#ifdef __cplusplus +} +#endif + + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/src/version.h new/gwenhywfar-5.8.2/src/version.h --- old/gwenhywfar-5.7.4/src/version.h 2021-11-13 19:12:30.000000000 +0100 +++ new/gwenhywfar-5.8.2/src/version.h 2022-01-13 22:13:04.000000000 +0100 @@ -31,12 +31,12 @@ #define GWEN_VERSION_MAJOR 5 #define GWENHYWFAR_VERSION_MAJOR 5 -#define GWENHYWFAR_VERSION_MINOR 7 -#define GWENHYWFAR_VERSION_PATCHLEVEL 4 +#define GWENHYWFAR_VERSION_MINOR 8 +#define GWENHYWFAR_VERSION_PATCHLEVEL 2 #define GWENHYWFAR_VERSION_BUILD 0 #define GWENHYWFAR_VERSION_TAG "stable" -#define GWENHYWFAR_VERSION_FULL_STRING "5.7.4stable-0" -#define GWENHYWFAR_VERSION_STRING "5.7.4" +#define GWENHYWFAR_VERSION_FULL_STRING "5.8.2stable-0" +#define GWENHYWFAR_VERSION_STRING "5.8.2" #define GWENHYWFAR_SO_EFFECTIVE 79 #define GWENHYWFAR_SO_EFFECTIVE_STR "79" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/gcttool/Makefile.am new/gwenhywfar-5.8.2/tools/gcttool/Makefile.am --- old/gwenhywfar-5.7.4/tools/gcttool/Makefile.am 2021-05-01 13:55:40.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/gcttool/Makefile.am 2021-12-30 12:05:36.000000000 +0100 @@ -36,7 +36,7 @@ noinst_PROGRAMS=cttest cttest_SOURCES=cttest.c -cttest_LDADD=$(top_builddir)/src/$(gwenhywfar_internal_libname) +cttest_LDADD=$(top_builddir)/src/$(gwenhywfar_internal_libname) @i18n_libs@ if IF_HAVE_OPENSSL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/typemaker/Makefile.am new/gwenhywfar-5.8.2/tools/typemaker/Makefile.am --- old/gwenhywfar-5.7.4/tools/typemaker/Makefile.am 2019-10-04 00:20:36.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/typemaker/Makefile.am 2021-12-31 01:01:10.000000000 +0100 @@ -7,11 +7,12 @@ typemaker_SOURCES=args.c main.c phc.c lhc.c ahc.c code_c.c typemaker_LDADD=$(top_builddir)/src/$(gwenhywfar_internal_libname) +typemaker_LDFLAGS=@i18n_libs@ if IS_WINDOWS -typemaker_LDFLAGS=-mconsole +typemaker_LDFLAGS+=-mconsole typemaker_LDADD+= $(PROG_LIBRARIES) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/typemaker2/Makefile.am new/gwenhywfar-5.8.2/tools/typemaker2/Makefile.am --- old/gwenhywfar-5.7.4/tools/typemaker2/Makefile.am 2021-10-07 20:13:38.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/typemaker2/Makefile.am 2021-12-15 23:19:23.000000000 +0100 @@ -56,8 +56,7 @@ # tm_enum.c -typemaker2_LDADD=$(top_builddir)/src/$(gwenhywfar_internal_libname) \ - c/libtm2_c.la +typemaker2_LDADD=c/libtm2_c.la $(top_builddir)/src/$(gwenhywfar_internal_libname) if IS_WINDOWS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/typemaker2/c/Makefile.am new/gwenhywfar-5.8.2/tools/typemaker2/c/Makefile.am --- old/gwenhywfar-5.7.4/tools/typemaker2/c/Makefile.am 2021-10-23 16:52:54.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/typemaker2/c/Makefile.am 2021-12-15 23:19:23.000000000 +0100 @@ -1,5 +1,5 @@ -INCLUDES=@all_includes@ -I$(top_builddir) -I../ -I../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir) +INCLUDES=@all_includes@ -I$(top_builddir) -I../ -I$(srcdir)/../ -I../../ -I$(srcdir)/../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir) noinst_LTLIBRARIES=libtm2_c.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/typemaker2/c/tm2c_misc.c new/gwenhywfar-5.8.2/tools/typemaker2/c/tm2c_misc.c --- old/gwenhywfar-5.7.4/tools/typemaker2/c/tm2c_misc.c 2021-10-07 20:13:38.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/typemaker2/c/tm2c_misc.c 2021-12-15 23:19:23.000000000 +0100 @@ -51,6 +51,7 @@ if (Typemaker2_Type_GetType(mty)==TypeMaker2_Type_Pointer) { + GWEN_Buffer_AppendArgs(tbuf, " p_struct->%s=NULL;\n", Typemaker2_Member_GetName(tm)); GWEN_Buffer_AppendString(tbuf, " }\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenhywfar-5.7.4/tools/xmlmerge/Makefile.am new/gwenhywfar-5.8.2/tools/xmlmerge/Makefile.am --- old/gwenhywfar-5.7.4/tools/xmlmerge/Makefile.am 2019-10-04 00:20:36.000000000 +0200 +++ new/gwenhywfar-5.8.2/tools/xmlmerge/Makefile.am 2021-12-31 01:01:10.000000000 +0100 @@ -5,10 +5,11 @@ xmlmerge_SOURCES=args.c main.c xmlmerge_LDADD=$(top_builddir)/src/$(gwenhywfar_internal_libname) +xmlmerge_LDFLAGS=@i18n_libs@ if IS_WINDOWS -xmlmerge_LDFLAGS=-mconsole +xmlmerge_LDFLAGS+=-mconsole xmlmerge_LDADD+=$(PROG_LIBRARIES) endif
