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

Compilation fixes for wxUSE_STL==1 build

Browse Source 
Add an explicit call to wc_str() in one place where conversion to
wchar_t* is needed and use wxString::operator==() instead of lstrcmp()
to avoid having to perform this conversion explicitly in another place.
This commit is contained in:
Vadim Zeitlin
2017-11-07 21:00:13 +01:00
parent ac4f99fa0d
commit 4f5f4af3b1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/graphics.cpp
View File

@@ -1000,7 +1000,7 @@ wxGDIPlusFontData::Init(const wxString& name,
{ {
wchar_t familyName[LF_FACESIZE]; wchar_t familyName[LF_FACESIZE];
int rc = gs_pFontFamily[j].GetFamilyName(familyName); int rc = gs_pFontFamily[j].GetFamilyName(familyName);
if ( rc == 0 && lstrcmp(name, familyName) == 0 ) if ( rc == 0 && name == familyName )
{ {
m_font = new Font(&gs_pFontFamily[j], size, style, fontUnit); m_font = new Font(&gs_pFontFamily[j], size, style, fontUnit);
break; break;
@@ -1009,7 +1009,7 @@ wxGDIPlusFontData::Init(const wxString& name,
} }
if ( !m_font ) if ( !m_font )
m_font = new Font(name, size, style, fontUnit); m_font = new Font(name.wc_str(), size, style, fontUnit);
m_textBrush = new SolidBrush(wxColourToColor(col)); m_textBrush = new SolidBrush(wxColourToColor(col));
} }