Compilation fixes for wxUSE_STL==1 build
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:
@@ -1000,7 +1000,7 @@ wxGDIPlusFontData::Init(const wxString& name,
|
||||
{
|
||||
wchar_t familyName[LF_FACESIZE];
|
||||
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);
|
||||
break;
|
||||
@@ -1009,7 +1009,7 @@ wxGDIPlusFontData::Init(const wxString& name,
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
|
Reference in New Issue
Block a user