From 3f7c8a876271eafa909c55293e3e999593ba4ade Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin <vadim@wxwidgets.org> Date: Sun, 17 May 2009 14:01:38 +0000 Subject: [PATCH] use a different known good face name under non-MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/font/fonttest.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp index 2e9c3ebf9e..5f2c171c7f 100644 --- a/tests/font/fonttest.cpp +++ b/tests/font/fonttest.cpp @@ -109,7 +109,15 @@ void FontTestCase::GetSet() CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") ); CPPUNIT_ASSERT( !test.IsOk() ); - CPPUNIT_ASSERT( test.SetFaceName("Arial") ); + // if the call to SetFaceName() below fails on your system/port, + // consider adding another branch to this #if +#if defined(__WXMSW__) || defined(__WXOSX__) + static const char *knownGoodFaceName = "Arial"; +#else + static const char *knownGoodFaceName = "Fixed"; +#endif + + CPPUNIT_ASSERT( test.SetFaceName(knownGoodFaceName) ); CPPUNIT_ASSERT( test.IsOk() ); -- 2.47.2