Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building wxMSW GDI+ graphics code in non-Unicode build

Browse Source 
Use wc_str() with GDI+ function which always takes wide strings, even in
non-Unicode build.

Closes #18172.
This commit is contained in:
Vadim Zeitlin
2018-07-21 14:07:32 +02:00
parent d390bee8a2
commit d605405ca1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -118,6 +118,7 @@ wxMSW:
- Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu). - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).
- Honour alignment flags for multiline buttons using custom colours too. - Honour alignment flags for multiline buttons using custom colours too.
- Support MSVC auto-linking when using monolithic build too (PB). - Support MSVC auto-linking when using monolithic build too (PB).
- Fix build in ANSI (non-Unicode) mode.
wxOSX: wxOSX:

2
src/msw/graphics.cpp
View File

@@ -2335,7 +2335,7 @@ void wxGDIPlusRenderer::Load()
for ( size_t i = 0 ; i < n; i++ ) for ( size_t i = 0 ; i < n; i++ )
{ {
const wxString& fname = privateFonts[i]; const wxString& fname = privateFonts[i];
gs_privateFonts->AddFontFile(fname.t_str()); gs_privateFonts->AddFontFile(fname.wc_str());
} }
gs_pFontFamily = new Gdiplus::FontFamily[n]; gs_pFontFamily = new Gdiplus::FontFamily[n];