From a3a4dcebdb8e6db41c77e8e7c9ef0e7dfc116ca8 Mon Sep 17 00:00:00 2001 From: utelle Date: Mon, 19 Feb 2024 20:59:55 +0100 Subject: [PATCH] Apply final adjustments for wxPdfDocument 1.2.0 - Add info about compatibility with wxWidgets (minimum required version now 3.2.0) - Require wxWidgets 3.2.0 as minimum version in autoconf/automake build files - Adjust premake5 file to use wxWidgets 3.2 as default --- CHANGELOG.md | 2 ++ configure.ac | 2 +- premake/wxwidgets.lua | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c24d58c2..eeeb2d16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and from version 0.9.0 onwards this project adheres to [Semantic Versioning](htt ## [1.2.0] - 2024-02-18 +**wxPdfDocument** is compatible with wxWidgets versions 3.2.x and above. + ### Added - Added support for document protection with AES-256 encryption (PDF 2.0). diff --git a/configure.ac b/configure.ac index 168ade74..365b78a3 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ AC_LANG(C++) AC_ARG_VAR(WX_CONFIG, [Path to wx-config script (default: search in PATH).]) WX_CONFIG_OPTIONS -WX_CONFIG_CHECK([3.0.0], +WX_CONFIG_CHECK([3.2.0], [], [AC_MSG_FAILURE([wxWidgets required but not detected.])], [base,core,xml] diff --git a/premake/wxwidgets.lua b/premake/wxwidgets.lua index 993938a5..082928d1 100644 --- a/premake/wxwidgets.lua +++ b/premake/wxwidgets.lua @@ -8,7 +8,7 @@ -- Optional environment variable specifying the wxWidgets version newoption { trigger = "wx_ver", - value = "3.1", + value = "3.2", description = "Version of the wxWidgets build to be used" } @@ -40,7 +40,7 @@ newoption { } if not _OPTIONS["wx_ver"] then - _OPTIONS["wx_ver"] = "3.1" + _OPTIONS["wx_ver"] = "3.2" end if not _OPTIONS["wx_env"] then @@ -143,7 +143,7 @@ end -- Root : path to wx root folder. Can be left empty if WXWIN is defined -- or if wx-config is accessible. -- Debug : "yes" use debug version of wxwidgets. Default to "no" --- Version : one of '2.8', '2.9', '3.0', '3.1'. Default to '3.1' +-- Version : one of '2.8', '2.9', '3.0', '3.1', '3.2'. Default to '3.2' -- Static : indicates how wx is to be linked. Values are -- either "yes" for static linking or "no" for shared linking, Default to "no" -- Unicode : use "yes" for unicode or "no" for ansi version. @@ -171,7 +171,7 @@ function wx_config(options) wx_config_Private( options.Root or "", options.Debug or "", options.Host or "", - options.Version or "3.1", + options.Version or "3.2", options.Static or "", options.Unicode or "yes", options.Universal or "",