AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use "monospace" face name for all Unix systems, hopefully it should work.

Browse Source 
This fixes failures of several build bot slaves (all running Debian or
Ubuntu) which were due to using "Fixed" under these Linux distributions.

Unfortunately "Fixed" didn't work as Pango doesn't seem to recognize it as a
valid face name. "DejaVu Sans" should probably work on most current Linux
systems but "Monospace" should hopefully be available on other Unix systems as
well.

We could also just take whatever wxFontEnumerator returns which should
probably be even more fool-proof.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-04-18 22:15:53 +00:00
parent 21e02d56c2
commit b7cb8553f3
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/font/fonttest.cpp
View File

@ -97,7 +97,7 @@ void FontTestCase::GetSet()
{
unsigned numFonts;
const wxFont *pf = GetTestFonts(numFonts);
for ( size_t n = 0; n < numFonts; n++ )
for ( unsigned n = 0; n < numFonts; n++ )
{
wxFont test(*pf++);
@ -113,23 +113,17 @@ void FontTestCase::GetSet()
// consider adding another branch to this #if
#if defined(__WXMSW__) || defined(__WXOSX__)
static const char *knownGoodFaceName = "Arial";
#elif defined(__LINUX__)
static const char *knownGoodFaceName;
wxString distroname = wxGetLinuxDistributionInfo().Id;
if (distroname.Contains("Ubuntu"))
knownGoodFaceName = "FreeSerif";
// ttf-freefont and ttf-dejavu packages are installed by default on [X,K]Ubuntu systems
else if (distroname == "Debian")
knownGoodFaceName = "Fixed";
else
knownGoodFaceName = "DejaVu Sans";
// this is very popular in many linux distro...
#else
static const char *knownGoodFaceName = "Fixed";
static const char *knownGoodFaceName = "Monospace";
#endif
CPPUNIT_ASSERT( test.SetFaceName(knownGoodFaceName) );
WX_ASSERT_MESSAGE
(
("failed to set face name \"%s\" for test font #%u\n"
"(this failure is harmless if this face name is not "
"available on this system)", knownGoodFaceName, n),
test.SetFaceName(knownGoodFaceName)
);
CPPUNIT_ASSERT( test.IsOk() );