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

Allow native font specification

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-06-09 09:37:28 +00:00
parent d9d488cf1b
commit 69ffc7b206
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11/font.cpp
View File

@@ -883,6 +883,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
node = node->GetNext(); node = node->GetNext();
} }
wxString xFontName = M_FONTDATA->m_nativeFontInfo.GetXFontName();
// not found, create a new one // not found, create a new one
XFontStruct *font = (XFontStruct *) XFontStruct *font = (XFontStruct *)
wxLoadQueryNearestFont(pointSize, wxLoadQueryNearestFont(pointSize,
@@ -891,7 +893,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
M_FONTDATA->m_weight, M_FONTDATA->m_weight,
M_FONTDATA->m_underlined, M_FONTDATA->m_underlined,
wxT(""), wxT(""),
M_FONTDATA->m_encoding); M_FONTDATA->m_encoding,
& xFontName);
if ( !font ) if ( !font )
{ {