recall initial font

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 42101a4c0eb77c35db67b7fa87f71662b0f7b8ee..7cee2a8e061775d50413d7ef1c9830562e680bd6 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -4,7 +4,7 @@
 // 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

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


@@ -43,6 +43,8 @@
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 

+const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");
+

 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------


@@ -517,7 +519,9 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
             else
             {
                 output.append(ent_s-1, c-ent_s+2);
             else
             {
                 output.append(ent_s-1, c-ent_s+2);

-                wxLogDebug(wxT("Unrecognized HTML entity: '%s'"), entity.c_str());
+                wxLogTrace(wxTRACE_HTML_DEBUG,
+                           wxT("Unrecognized HTML entity: '%s'"),
+                           entity.c_str());

             }
         }
     }
             }
         }
     }


@@ -856,7 +860,8 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
 wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
                                 const wxString& url) const
 {
 wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
                                 const wxString& url) const
 {

-    return GetFS()->OpenFile(url);
+    return m_FS ? m_FS->OpenFile(url) : NULL;
+    

 }
 
 
 }