From d605405ca1cdebc260569018686e03fb28434b9a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Jul 2018 14:07:32 +0200 Subject: [PATCH] Fix building wxMSW GDI+ graphics code in non-Unicode build Use wc_str() with GDI+ function which always takes wide strings, even in non-Unicode build. Closes #18172. --- docs/changes.txt | 1 + src/msw/graphics.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 7936144c7b..94c3ce14eb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -118,6 +118,7 @@ wxMSW: - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu). - Honour alignment flags for multiline buttons using custom colours too. - Support MSVC auto-linking when using monolithic build too (PB). +- Fix build in ANSI (non-Unicode) mode. wxOSX: diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index f7c014d9d4..8d752b8ab6 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -2335,7 +2335,7 @@ void wxGDIPlusRenderer::Load() for ( size_t i = 0 ; i < n; i++ ) { const wxString& fname = privateFonts[i]; - gs_privateFonts->AddFontFile(fname.t_str()); + gs_privateFonts->AddFontFile(fname.wc_str()); } gs_pFontFamily = new Gdiplus::FontFamily[n];