wxSystemSettings class API face lift: better names for its methods

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 87b8dec247cde7ff3388db3e08d799b2b97f3ed8..1b166505b1746ec5ce4843bf2274aba0de53e2a6 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -465,7 +465,7 @@ void wxNativeFontInfo::SetUnderlined(bool underlined)
 
 void wxNativeFontInfo::SetFaceName(wxString facename)
 {
 
 void wxNativeFontInfo::SetFaceName(wxString facename)
 {

-    wxStrncpy(lf.lfFaceName, facename, sizeof(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));

 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)


@@ -521,19 +521,22 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP

-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        {
+            if ( !info.facename.empty() )
+            {
+                // if we have this encoding only in some particular facename, use
+                // the facename - it is better to show the correct characters in a
+                // wrong facename than unreadable text in a correct one
+                SetFaceName(info.facename);
+            }
+        }
+        else

 #endif // wxUSE_FONTMAP
         {
             // unsupported encoding, replace with the default
             info.charset = ANSI_CHARSET;
         }
 #endif // wxUSE_FONTMAP
         {
             // unsupported encoding, replace with the default
             info.charset = ANSI_CHARSET;
         }

-        else if ( !info.facename.empty() )
-        {
-            // if we have this encoding only in some particular facename, use
-            // the facename - it is better to show the correct characters in a
-            // wrong facename than unreadable text in a correct one
-            SetFaceName(info.facename);
-        }

     }
 
     lf.lfCharSet = info.charset;
     }
 
     lf.lfCharSet = info.charset;