compilation fixes for !wxUSE_FONTMAP

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index bdc45ec3bcff1f02f0ab2a9405cac7711029d31c..94b9bab49bf9940bfa1630b6326bf13c0d67078d 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -450,11 +450,13 @@ wxString wxNativeFontInfo::ToUserString() const
         desc << _T(' ') << size;
     }
 
         desc << _T(' ') << size;
     }
 

+#if wxUSE_FONTMAP

     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
         desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc);
     }
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
         desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc);
     }

+#endif // wxUSE_FONTMAP

 
     return desc;
 }
 
     return desc;
 }


@@ -471,7 +473,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;

+
+#if wxUSE_FONTMAP

     wxFontEncoding encoding;
     wxFontEncoding encoding;

+#endif // wxUSE_FONTMAP

 
     while ( tokenizer.HasMoreTokens() )
     {
 
     while ( tokenizer.HasMoreTokens() )
     {


@@ -501,11 +506,13 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         {
             SetPointSize(size);
         }
         {
             SetPointSize(size);
         }

+#if wxUSE_FONTMAP

         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }
         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }

+#endif // wxUSE_FONTMAP

         else // assume it is the face name
         {
             if ( !face.empty() )
         else // assume it is the face name
         {
             if ( !face.empty() )

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 27c2d4b90593f5dee5c42cf51bd5a02c2dde8ec4..1b166505b1746ec5ce4843bf2274aba0de53e2a6 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -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;