From 0f964898120e0a037122e70e8e7c48bb2085aeb3 Mon Sep 17 00:00:00 2001 From: scheffle Date: Thu, 13 Apr 2023 13:44:04 +0200 Subject: [PATCH] ignore deprecation of codecvt_utf8_utf16 and wstring_convert on Windows --- vstgui/lib/platform/common/generictextedit.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vstgui/lib/platform/common/generictextedit.cpp b/vstgui/lib/platform/common/generictextedit.cpp index 3defc3623..e1803d5f2 100644 --- a/vstgui/lib/platform/common/generictextedit.cpp +++ b/vstgui/lib/platform/common/generictextedit.cpp @@ -2,10 +2,6 @@ // in the LICENSE file found in the top-level directory of this // distribution and at http://github.com/steinbergmedia/vstgui/LICENSE -#if defined(_WIN32) -#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING -#endif - #include "generictextedit.h" #include "../iplatformfont.h" #include "../iplatformframe.h" @@ -23,6 +19,9 @@ #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) #endif //----------------------------------------------------------------------------- @@ -862,4 +861,6 @@ float STBTextEditView::getCharWidth (STBTextEditView* self, int n, int i) #ifdef __clang__ #pragma clang diagnostic pop +#elif defined(_MSC_VER) +#pragma warning(pop) #endif