Don't use ternary operator ?: with wxString and literal strings.

This results in warnings about converting string literal to (non const) C
string.

Also remove the now unneeded calls to c_str() inside wxString::Printf().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-02-15 12:40:20 +00:00
parent c8723b866e
commit 35f6f71b19

View File

@@ -989,9 +989,9 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
{
wxString fontspec;
fontspec.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-%s-%s"),
!info.facename ? wxT("*") : info.facename.c_str(),
info.xregistry.c_str(),
info.xencoding.c_str());
info.facename.empty() ? wxString("*") : info.facename,
info.xregistry,
info.xencoding);
return wxTestFontSpec(fontspec);
}