COnversion of some common font names to current platform
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
12df0ad59f
commit
a2beab222f
@ -1779,6 +1779,10 @@ protected:
|
|||||||
// in a larger document
|
// in a larger document
|
||||||
#define wxRICHTEXT_HANDLER_NO_HEADER_FOOTER 0x0080
|
#define wxRICHTEXT_HANDLER_NO_HEADER_FOOTER 0x0080
|
||||||
|
|
||||||
|
// Convert the more common face names to names that will work on the current platform
|
||||||
|
// in a larger document
|
||||||
|
#define wxRICHTEXT_HANDLER_CONVERT_FACENAMES 0x0100
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* wxRichTextFileHandler
|
* wxRichTextFileHandler
|
||||||
* Base class for file handlers
|
* Base class for file handlers
|
||||||
|
@ -1079,6 +1079,53 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttr& attr, bool isPara)
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Replace face name with current name for platform.
|
||||||
|
/// TODO: introduce a virtual function or settable table to
|
||||||
|
/// do this comprehensively.
|
||||||
|
bool wxRichTextFixFaceName(wxString& facename)
|
||||||
|
{
|
||||||
|
if (facename.IsEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
if (facename == wxT("Times"))
|
||||||
|
{
|
||||||
|
facename = wxT("Times New Roman");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (facename == wxT("Helvetica"))
|
||||||
|
{
|
||||||
|
facename = wxT("Arial");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (facename == wxT("Courier"))
|
||||||
|
{
|
||||||
|
facename = wxT("Courier New");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
|
if (facename == wxT("Times New Roman"))
|
||||||
|
{
|
||||||
|
facename = wxT("Times");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (facename == wxT("Arial"))
|
||||||
|
{
|
||||||
|
facename = wxT("Helvetica");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (facename == wxT("Courier New"))
|
||||||
|
{
|
||||||
|
facename = wxT("Courier");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/// Get style parameters
|
/// Get style parameters
|
||||||
bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)
|
bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)
|
||||||
{
|
{
|
||||||
@ -1093,7 +1140,12 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
|
|||||||
|
|
||||||
fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
|
fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
|
||||||
if (!fontFacename.IsEmpty())
|
if (!fontFacename.IsEmpty())
|
||||||
|
{
|
||||||
attr.SetFontFaceName(fontFacename);
|
attr.SetFontFaceName(fontFacename);
|
||||||
|
if (GetFlags() & wxRICHTEXT_HANDLER_CONVERT_FACENAMES)
|
||||||
|
wxRichTextFixFaceName(fontFacename);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
wxString value;
|
wxString value;
|
||||||
//value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
|
//value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
|
||||||
|
Loading…
Reference in New Issue
Block a user