reenable WS_TABSTOP (patch 1045547)

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 7d4b57ff192b4fb0be33962cf998dc17af093111..3920675618376c3ecaff03f1a10d3067eb3d2846 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -226,7 +226,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 
             // remember the alt encoding for this charset -- or remember that
             // we don't know it
-            long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding;
+            long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
             if ( !config->Write(charset, value) )
             {
                 wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
@@ -316,7 +316,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
     wxString configEntry,
              encName = GetEncodingName(encoding);
-    if ( !!facename )
+    if ( !facename.IsEmpty() )
     {
         configEntry = facename + _T("_");
     }
@@ -340,13 +340,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     else // use the info entered the last time
     {
-        if ( !!fontinfo && !!facename )
+        if ( !fontinfo.IsEmpty() && !facename.IsEmpty() )
         {
             // we tried to find a match with facename -- now try without it
             fontinfo = GetConfig()->Read(encName);
         }
 
-        if ( !!fontinfo )
+        if ( !fontinfo.IsEmpty() )
         {
             if ( info->FromString(fontinfo) )
             {