Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes for wxUSE_FONTMAP==0.

Browse Source 
Closes #11150.

Closes #11152.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-28 10:44:12 +00:00
parent 1c51fc784d
commit dc2575bad4
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/core/strconv_cf.cpp
View File

@@ -33,6 +33,7 @@
* assume ABI compatibility even within a given wxWidgets release. * assume ABI compatibility even within a given wxWidgets release.
*/ */
#if wxUSE_FONTMAP
WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf( const char* name) WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf( const char* name)
{ {
wxMBConv_cf *result = new wxMBConv_cf(name); wxMBConv_cf *result = new wxMBConv_cf(name);
@@ -44,6 +45,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf( const char* name)
else else
return result; return result;
} }
#endif // wxUSE_FONTMAP
WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding) WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
{ {

2
src/xrc/xmlres.cpp
View File

@@ -1793,6 +1793,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
// encoding // encoding
wxFontEncoding enc = wxFONTENCODING_DEFAULT; wxFontEncoding enc = wxFONTENCODING_DEFAULT;
bool hasEncoding = HasParam(wxT("encoding")); bool hasEncoding = HasParam(wxT("encoding"));
#if wxUSE_FONTMAP
if (hasEncoding) if (hasEncoding)
{ {
wxString encoding = GetParamValue(wxT("encoding")); wxString encoding = GetParamValue(wxT("encoding"));
@@ -1802,6 +1803,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
if (enc == wxFONTENCODING_SYSTEM) if (enc == wxFONTENCODING_SYSTEM)
enc = wxFONTENCODING_DEFAULT; enc = wxFONTENCODING_DEFAULT;
} }
#endif // wxUSE_FONTMAP
// is this font based on a system font? // is this font based on a system font?
wxFont font = GetSystemFont(GetParamValue(wxT("sysfont"))); wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));