]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't use ternary operator ?: with wxString and literal strings.
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 15 Feb 2013 12:40:20 +0000 (12:40 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 15 Feb 2013 12:40:20 +0000 (12:40 +0000)
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

src/unix/fontutil.cpp

index 07ee3233f2800d7cf9a248fed6b6ddbdf8026f91..883fbd7febe48f6586d1217288da2fc585f45c1d 100644 (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);
 }