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

use enumerations instead of integers for wxFont style/weight/family

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-16 20:46:20 +00:00
parent 634ad7722b
commit 7d76fbd5a1
7 changed files with 113 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextxml.cpp
View File

@@ -1131,9 +1131,9 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
{
wxString fontFacename;
int fontSize = 12;
int fontFamily = wxFONTFAMILY_DEFAULT;
int fontWeight = wxNORMAL;
int fontStyle = wxNORMAL;
wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT;
wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
bool fontUnderlined = false;
// int fontFlags = 0;
@@ -1150,14 +1150,14 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
if (!value.empty())
{
fontFamily = wxAtoi(value);
fontFamily = (wxFontFamily)wxAtoi(value);
attr.SetFontFamily(fontFamily);
}
value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);
if (!value.empty())
{
fontStyle = wxAtoi(value);
fontStyle = (wxFontStyle)wxAtoi(value);
attr.SetFontStyle(fontStyle);
}
@@ -1171,7 +1171,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
value = node->GetAttribute(wxT("fontweight"), wxEmptyString);
if (!value.empty())
{
fontWeight = wxAtoi(value);
fontWeight = (wxFontWeight)wxAtoi(value);
attr.SetFontWeight(fontWeight);
}