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

fall back to DirectFB's builtin font if no fonts are configured

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-15 12:38:19 +00:00
parent 402dc2145d
commit c4f6f41c84
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dfb/fontmgr.cpp
View File

@@ -37,6 +37,11 @@
// wxFontInstance // wxFontInstance
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// This is a fake "filename" for DirectFB's builtin font (which isn't loaded
// from a file); we can't use empty string, because that's already used for
// "this face is not available" by wxFontsManagerBase
#define BUILTIN_DFB_FONT_FILENAME "/dev/null"
wxFontInstance::wxFontInstance(float ptSize, bool aa, wxFontInstance::wxFontInstance(float ptSize, bool aa,
const wxString& filename) const wxString& filename)
: wxFontInstanceBase(ptSize, aa) : wxFontInstanceBase(ptSize, aa)
@@ -55,7 +60,11 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa,
DFDESC_ATTRIBUTES | DFDESC_FRACT_HEIGHT); DFDESC_ATTRIBUTES | DFDESC_FRACT_HEIGHT);
desc.attributes = aa ? DFFA_NONE : DFFA_MONOCHROME; desc.attributes = aa ? DFFA_NONE : DFFA_MONOCHROME;
desc.fract_height = pixSize; desc.fract_height = pixSize;
m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
if ( filename == BUILTIN_DFB_FONT_FILENAME )
m_font = wxIDirectFB::Get()->CreateFont(NULL, &desc);
else
m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
wxASSERT_MSG( m_font, _T("cannot create font instance") ); wxASSERT_MSG( m_font, _T("cannot create font instance") );
} }
@@ -163,8 +172,23 @@ void wxFontsManager::AddAllFonts()
if ( GetBundles().empty() ) if ( GetBundles().empty() )
{ {
// wxDFB is unusable without fonts, so terminate the app // We can fall back to the builtin default font if no other fonts are
wxLogFatalError(_("No fonts found in %s."), path.c_str()); // defined:
wxLogTrace(_T("font"),
_("no fonts found in %s, using builtin font"), path);
AddBundle
(
new wxFontBundle
(
_("Default font"),
BUILTIN_DFB_FONT_FILENAME,
wxEmptyString,
wxEmptyString,
wxEmptyString,
false // IsFixed
)
);
} }
} }