added DoPrepareDC()

[wxWidgets.git] / src / html / m_fonts.cpp

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 977949dab955c4f209711f0a33e34a4e0a8d8b9e..1a0aefdd18703c90067bbdd134f0adf69f209662 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -75,7 +75,9 @@ TAG_HANDLER_BEGIN(FONT, "FONT" )
             {
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();
             {
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();

-                m_Faces = *enu.GetFacenames();
+                const wxArrayString *faces = enu.GetFacenames();
+                if ( faces )
+                    m_Faces = *faces;

             }
             wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));
             int index;
             }
             wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));
             int index;