use GTK-specific GUI lock

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

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index ebcbe2625ad7a2d0d8a66ec3dd432db5ea958fed..cd33cd2119d9b26cd1c0fd49fa1d5ec770ad1503 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_fonts.cpp
+// Name:        src/html/m_fonts.cpp

 // Purpose:     wxHtml module for fonts & colors of fonts
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for fonts & colors of fonts
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -7,19 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HTML && wxUSE_STREAMS
+

 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP
 #endif
 


@@ -72,13 +67,8 @@ TAG_HANDLER_BEGIN(FONT, "FONT" )
         if (tag.HasParam(wxT("FACE")))
         {
             if (m_Faces.GetCount() == 0)
         if (tag.HasParam(wxT("FACE")))
         {
             if (m_Faces.GetCount() == 0)

-            {
-                wxFontEnumerator enu;
-                enu.EnumerateFacenames();
-                const wxArrayString *faces = enu.GetFacenames();
-                if ( faces )
-                    m_Faces = *faces;
-            }
+                m_Faces = wxFontEnumerator::GetFacenames();
+

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