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

miscellaneous wxFont enhancements (patch 1496606):

Browse Source 
- made SetFaceName() bool and return false if the face name is not available
- corrected To/FromUserString() to complement each other


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-29 00:03:36 +00:00
parent 7aa7d2d407
commit 85ab460e7d
31 changed files with 378 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk1/font.cpp
View File

@@ -88,7 +88,7 @@ public:
void SetStyle(int style);
void SetWeight(int weight);
void SetUnderlined(bool underlined);
void SetFaceName(const wxString& facename);
bool SetFaceName(const wxString& facename);
void SetEncoding(wxFontEncoding encoding);
void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
@@ -436,7 +436,7 @@ void wxFontRefData::SetUnderlined(bool underlined)
// the XLFD doesn't have "underlined" field anyhow
}
void wxFontRefData::SetFaceName(const wxString& facename)
bool wxFontRefData::SetFaceName(const wxString& facename)
{
m_faceName = facename;
@@ -444,6 +444,8 @@ void wxFontRefData::SetFaceName(const wxString& facename)
{
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
}
return true;
}
void wxFontRefData::SetEncoding(wxFontEncoding encoding)
@@ -688,11 +690,12 @@ void wxFont::SetWeight(int weight)
M_FONTDATA->SetWeight(weight);
}
void wxFont::SetFaceName(const wxString& faceName)
bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
M_FONTDATA->SetFaceName(faceName);
return M_FONTDATA->SetFaceName(faceName) &&
wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)