From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 28 Aug 2009 10:44:12 +0000 (+0000)
Subject: Compilation fixes for wxUSE_FONTMAP==0.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dc2575bad4f220ecab4d7ee2ffb44778a8381126?hp=1c51fc784d3036f5ca3830141f8eee56934f44b7

Compilation fixes for wxUSE_FONTMAP==0.

Closes #11150.

Closes #11152.

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

diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp
index 4355ee032a..aba2402411 100644
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -33,6 +33,7 @@
  * assume ABI compatibility even within a given wxWidgets release.
  */
 
+#if wxUSE_FONTMAP
 WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf( const char* name)
 {
     wxMBConv_cf *result = new wxMBConv_cf(name);
@@ -44,6 +45,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf( const char* name)
     else
         return result;
 }
+#endif // wxUSE_FONTMAP
 
 WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
 {
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index c4b2ae9a2e..94064a2cfc 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1793,6 +1793,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     // encoding
     wxFontEncoding enc = wxFONTENCODING_DEFAULT;
     bool hasEncoding = HasParam(wxT("encoding"));
+#if wxUSE_FONTMAP
     if (hasEncoding)
     {
         wxString encoding = GetParamValue(wxT("encoding"));
@@ -1802,6 +1803,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
         if (enc == wxFONTENCODING_SYSTEM)
             enc = wxFONTENCODING_DEFAULT;
     }
+#endif // wxUSE_FONTMAP
 
     // is this font based on a system font?
     wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));