X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..bb69632a56a827bed4cfae842bfffa88259ac1aa:/src/html/m_fonts.cpp diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index 48664c686d..9e69afb79f 100644 --- 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$ @@ -9,14 +9,13 @@ #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP #endif #include "wx/html/forcelnk.h" @@ -68,13 +67,8 @@ TAG_HANDLER_BEGIN(FONT, "FONT" ) 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;