From 114624b3a57374d69e4e4c7c2dd9d9f8ac308489 Mon Sep 17 00:00:00 2001 From: Jertzukka Date: Sat, 18 May 2024 04:46:39 +0300 Subject: Prepare for changes in wxWidgets 3.3 (#1343) * Move from deprecated wxScopedPtr to std::unique_ptr wxScopedPtr was included previously through some header hierarchy which as of 3.3 is no longer the case causing it to break. But instead of including a header for a deprecated function explicitly, just move to std::unique_ptr as recommended by upstream. * Convert to explicit conversions from wxString As of https://github.com/wxWidgets/wxWidgets/pull/23449/commits/35c35c235e9c29b40002131602e050dca8d65b8c wxWidgets defaults to STL classes, which has a side-effect that some implicit conversions break. This patch converts those conversions to explicit in anticipation of wxWidgets 3.3 release. --- src/Main/Forms/VolumeCreationWizard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Main/Forms') diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 2653ff66..0eae11d6 100644 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -975,7 +975,7 @@ namespace VeraCrypt if (OuterVolume && VolumeSize > TC_MAX_FAT_SECTOR_COUNT * SectorSize) { uint64 limit = TC_MAX_FAT_SECTOR_COUNT * SectorSize / BYTES_PER_TB; - wstring err = StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024); + wstring err = static_cast(StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024)); if (SectorSize < 4096) { -- cgit v1.2.3