Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested).

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 827577693bd837daa355beedb7fd8f2d00170f5c..a30c4f14bbcae183bfa307db5698b8e873e57d2d 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -262,6 +262,8 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
         {
             GetConfig()->Write(configEntry, info->ToString());
         }
+#else
+        wxUnusedVar(configEntry);
 #endif // wxUSE_CONFIG
         return true;
     }
@@ -314,7 +316,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
     wxString configEntry,
              encName = GetEncodingName(encoding);
-    if ( !!facename )
+    if ( !facename.IsEmpty() )
     {
         configEntry = facename + _T("_");
     }
@@ -338,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) )
             {
@@ -468,6 +470,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         }
     }
     //else: we're in non-interactive mode
+#else
+    wxUnusedVar(equivEncoding);
 #endif // wxUSE_FONTDLG
 
     return foundEquivEncoding;