install wxUniv headers in make install and include wxUniv sources in make dist

[wxWidgets.git] / src / common / fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index c93277a60de756377a8a999c129a35e9add9ef89..6ab97b4c2f5416c7bfe8fd95f3301df03549b3cd 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -479,7 +479,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         cs.Trim(FALSE);
 
         // discard the optional quotes
-        if ( !!cs )
+        if ( !cs.empty() )
         {
             if ( cs[0u] == _T('"') && cs.Last() == _T('"') )
             {
@@ -489,7 +489,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
 
         cs.MakeUpper();
 
-        if ( !cs || cs == wxT("US-ASCII") )
+        if ( cs.empty() || cs == _T("US-ASCII") )
         {
             encoding = wxFONTENCODING_DEFAULT;
         }
@@ -810,7 +810,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
     size_t count = equiv.GetCount();
     bool foundEquivEncoding = FALSE;
-    wxFontEncoding equivEncoding;
+    wxFontEncoding equivEncoding = wxFONTENCODING_SYSTEM;
     if ( count )
     {
         for ( size_t i = 0; i < count && !foundEquivEncoding; i++ )