Don't reset bullet number and outline number when applying style sheet.

[wxWidgets.git] / tests / font / fonttest.cpp

diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp
index 5f2c171c7f783633083f171758362c24895514de..1c436ddf2085c434967d98e5383692c20b9459b7 100644 (file)
--- a/tests/font/fonttest.cpp
+++ b/tests/font/fonttest.cpp
@@ -97,7 +97,7 @@ void FontTestCase::GetSet()
 {
     unsigned numFonts;
     const wxFont *pf = GetTestFonts(numFonts);
 {
     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++);
 
     {
         wxFont test(*pf++);
 


@@ -114,10 +114,16 @@ void FontTestCase::GetSet()
 #if defined(__WXMSW__) || defined(__WXOSX__)
         static const char *knownGoodFaceName = "Arial";
 #else
 #if defined(__WXMSW__) || defined(__WXOSX__)
         static const char *knownGoodFaceName = "Arial";
 #else

-        static const char *knownGoodFaceName = "Fixed";
+        static const char *knownGoodFaceName = "Monospace";

 #endif
 
 #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() );
 
 
         CPPUNIT_ASSERT( test.IsOk() );
 
 


@@ -206,7 +212,14 @@ void FontTestCase::NativeFontInfo()
     // test that clearly invalid font info strings do not work
     wxFont font;
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("") );
     // test that clearly invalid font info strings do not work
     wxFont font;
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("") );

+
+    // pango_font_description_from_string() used by wxFont in wxGTK and wxX11
+    // never returns an error at all so this assertion fails there -- and as it
+    // doesn't seem to be possible to do anything about it maybe we should
+    // change wxMSW and other ports to also accept any strings?
+#if !defined(__WXGTK__) && !defined(__WXX11__)

     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );

+#endif

 }
 
 void FontTestCase::NativeFontInfoUserDesc()
 }
 
 void FontTestCase::NativeFontInfoUserDesc()